$NetBSD: patch-bt,v 1.1 2006/10/21 11:53:13 agc Exp $

--- ./sfsauthd/authclnt.C.orig	2002-12-01 02:45:25.000000000 +0000
+++ ./sfsauthd/authclnt.C
@@ -336,7 +336,7 @@ authclnt::dispatch (svccb *sbp)
   case SFSAUTH2_LOGIN:
     {
       sfsauth2_loginres res;
-      sfsauth_login (&res, sbp->template getarg<sfsauth2_loginarg> (),
+      sfsauth_login (&res, sbp->getarg<sfsauth2_loginarg> (),
 		     sfsauth_login_srp);
       sbp->replyref (res);
       break;
@@ -359,7 +359,7 @@ authclnt::dispatch (svccb *sbp)
 void
 authclnt::sfsauth_sign (svccb *sbp)
 {
-  sfsauth2_sign_arg *arg = sbp->template getarg<sfsauth2_sign_arg> ();
+  sfsauth2_sign_arg *arg = sbp->getarg<sfsauth2_sign_arg> ();
   sfsauth2_sign_res res (true);
   u_int32_t authno = sbp->getaui ();
   sfsauth_dbrec db;
@@ -514,7 +514,7 @@ authclnt::sfsauth_update (svccb *sbp)
     return;
   }
 
-  sfsauth2_update_arg *argp = sbp->template getarg<sfsauth2_update_arg> ();
+  sfsauth2_update_arg *argp = sbp->getarg<sfsauth2_update_arg> ();
   if (argp->req.type != SFS_UPDATEREQ
       || (argp->req.rec.type != SFSAUTH_USER
 	  && argp->req.rec.type != SFSAUTH_GROUP)) {
@@ -752,7 +752,7 @@ authclnt::get_user_cursor (dbfile **dbpp
 void
 authclnt::query_user (svccb *sbp)
 {
-  sfsauth2_query_arg *arg = sbp->template getarg<sfsauth2_query_arg> ();
+  sfsauth2_query_arg *arg = sbp->getarg<sfsauth2_query_arg> ();
   ptr<authcursor> ac;
   sfsauth2_query_res res;
 
@@ -808,7 +808,7 @@ authclnt::query_certinfo (svccb *sbp)
 void
 authclnt::query_group (svccb *sbp)
 {
-  sfsauth2_query_arg *arg = sbp->template getarg<sfsauth2_query_arg> ();
+  sfsauth2_query_arg *arg = sbp->getarg<sfsauth2_query_arg> ();
   sfsauth2_query_res res;
   if (arg->key.type != SFSAUTH_DBKEY_NAME
       && arg->key.type != SFSAUTH_DBKEY_ID) {
@@ -854,7 +854,7 @@ authclnt::query_group (svccb *sbp)
 void
 authclnt::sfsauth_query (svccb *sbp)
 {
-  sfsauth2_query_arg *arg = sbp->template getarg<sfsauth2_query_arg> ();
+  sfsauth2_query_arg *arg = sbp->getarg<sfsauth2_query_arg> ();
   switch (arg->type) {
   case SFSAUTH_USER:
     query_user (sbp);
@@ -885,7 +885,7 @@ authclnt::sfs_login (svccb *sbp)
     return;
   }
   sfsauth2_loginarg la;
-  la.arg = *sbp->template getarg<sfs_loginarg> ();
+  la.arg = *sbp->getarg<sfs_loginarg> ();
   la.authid = authid;
   la.source = client_name << "!" << progname;
 
@@ -937,7 +937,7 @@ authclnt::utab_insert (u_int32_t authno,
 void
 authclnt::sfs_logout (svccb *sbp)
 {
-  u_int32_t authno = *sbp->template getarg<u_int32_t> ();
+  u_int32_t authno = *sbp->getarg<u_int32_t> ();
   urec_t *u = utab[authno];
   if (u) 
     urecfree (u);