ptclient: rxgk support

[openafs.git] / src / ptserver / ptclient.c

diff --git a/src/ptserver/ptclient.c b/src/ptserver/ptclient.c
index 019d29b..ef613f0 100644 (file)
--- a/src/ptserver/ptclient.c
+++ b/src/ptserver/ptclient.c
@@ -34,11 +34,9 @@ char confdir[AFSDIR_PATH_MAX];
 
 char *whoami;
 
-#ifndef AFS_PTHREAD_ENV
 extern struct ubik_client *pruclient;
 static void skip(char **);
 static void PrintHelp(void);
-#endif
 
 static int ignoreExist = 0;
 static char line[256];
@@ -46,7 +44,6 @@ static char *lineProgress;
 
 #define WHITESPACE " \t\n"
 
-#ifndef AFS_PTHREAD_ENV
 int
 osi_audit(void)
 {
@@ -56,7 +53,6 @@ osi_audit(void)
  */
     return 0;
 }
-#endif /* !AFS_PTHREAD_ENV */
 
 int
 GetToken(char *format, afs_int32 *l)
@@ -147,7 +143,6 @@ PrintEntry(afs_int32 ea, struct prentry *e, int indent)
     return pr_PrintEntry(stdout, /*host order */ 1, ea, e, indent);
 }
 
-#ifndef AFS_PTHREAD_ENV
 
 /* main program */
 
@@ -173,6 +168,7 @@ main(int argc, char **argv)
     char *foo;
     afs_int32 over;
     char *cell;
+    afs_int32 rxgk_level = 0;
 
 #ifdef AFS_AIX32_ENV
     /*
@@ -206,15 +202,17 @@ main(int argc, char **argv)
            strncpy(confdir, AFSDIR_CLIENT_ETC_DIRPATH, sizeof(confdir));
        else if (IsArg("server"))
            strncpy(confdir, AFSDIR_SERVER_ETC_DIRPATH, sizeof(confdir));
-       else if (IsArg("0") || IsArg("1") || IsArg("2"))
+       else if (IsArg("0") || IsArg("1") || IsArg("2") || IsArg("3"))
            security = atoi(argv[n]);
+       else if (IsArg("-rxgk"))
+           rxgk_level = atoi(argv[++n]);
        else if (IsArg("-ignoreexist"))
            ignoreExist++;
        else if (IsArg("-cell"))
            cell = argv[++n];
        else {
            printf
-               ("Usage is: 'prclient [-testconfdir <dir> | server | client] [0 | 1 | 2] [-ignoreExist] [-cell <cellname>]\n");
+               ("Usage is: 'prclient [-testconfdir <dir> | server | client] [0 | 1 | 2 | 3] [-rxgk 0 | 1 | 2] [-ignoreExist] [-cell <cellname>]\n");
            exit(1);
        }
        n++;
@@ -224,7 +222,7 @@ main(int argc, char **argv)
     if (security == 0)
        printf("Making unauthenticated connection to prserver\n");
 
-    code = pr_Initialize(security, confdir, cell);
+    code = pr_Initialize2(security, confdir, cell, rxgk_level);
     if (code) {
        afs_com_err(whoami, code, "Couldn't initialize protection library");
        exit(1);
@@ -359,7 +357,7 @@ main(int argc, char **argv)
            foo = line;
            skip(&foo);
            for (i = 0; ((lnames.namelist_len < PR_MAXLIST)
-                        && (sscanf(foo, "%s", lnames.namelist_val[i]) !=
+                        && (sscanf(foo, "%63s", lnames.namelist_val[i]) !=
                             EOF)); i++) {
                lnames.namelist_len++;
                skip(&foo);
@@ -740,4 +738,3 @@ skip(char **s)
     while (**s == ' ')
        (*s)++;
 }
-#endif /* !AFS_PTHREAD_ENV */