Add rx security index enum

[openafs.git] / src / viced / fsprobe.c

diff --git a/src/viced/fsprobe.c b/src/viced/fsprobe.c
index d65990f..f4e30f8 100644 (file)
--- a/src/viced/fsprobe.c
+++ b/src/viced/fsprobe.c
@@ -10,8 +10,6 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID
-    ("$Header$");
 
 #include <afs/stds.h>
 #include <afs/afsint.h>
@@ -27,25 +25,11 @@ struct ubik_client *cstruct;
 struct rx_connection *serverconns[MAXSERVERS];
 char *(args[50]);
 
-extern int AFS_FetchData(), AFS_StoreData(), AFS_StoreACL();
-extern int RXAFS_GetTime(), AFS_GetStatistics(), AFS_FetchStatus(),
-AFS_FetchACL();
-extern int AFS_StoreStatus(), AFS_RemoveFile(), AFS_CreateFile();
-extern int AFS_Rename(), AFS_Symlink(), AFS_HardLink(), AFS_MakeDir(),
-AFS_RemoveDir();
-extern int AFS_Readdir(), AFS_MakeMountPoint(), AFS_ReleaseTokens(),
-AFS_GetToken();
-extern int AFS_BulkStatus(), AFS_Lookup();
-extern int AFS_BulkStatus(), AFS_BulkLookup(), AFS_RenewAllTokens();
-extern int AFS_BulkFetchVV(), AFS_BulkKeepAlive();
-extern int AFS_Spare1(), AFS_Spare2(), AFS_Spare3(), AFS_Spare4(),
-AFS_Spare5(), AFS_Spare6();
-
 afs_int32
 pxclient_Initialize(int auth, afs_int32 serverAddr)
 {
     afs_int32 code;
-    afs_int32 scIndex;
+    rx_securityIndex scIndex;
     struct rx_securityClass *sc;
 
     code = rx_Init(htons(2115) /*0 */ );
@@ -53,25 +37,9 @@ pxclient_Initialize(int auth, afs_int32 serverAddr)
        fprintf(stderr, "pxclient_Initialize:  Could not initialize rx.\n");
        return code;
     }
-    scIndex = 0;
+    scIndex = RX_SECIDX_NULL;
     rx_SetRxDeadTime(50);
-    switch (scIndex) {
-    case 0:
-       sc = rxnull_NewClientSecurityObject();
-       break;
-
-#ifdef notdef                  /* security */
-    case 1:
-       sc = rxvab_NewClientSecurityObject(&ttoken.sessionKey, ttoken.ticket,
-                                          0);
-       break;
-
-    case 2:
-       sc = rxkad_NewClientSecurityObject(rxkad_clear, &ttoken.sessionKey,
-                                          ttoken.kvno, ttoken.ticketLen,
-                                          ttoken.ticket);
-#endif /* notdef */
-    }
+    sc = rxnull_NewClientSecurityObject();
     serverconns[0] =
        rx_NewConnection(serverAddr, htons(7000), 1, sc, scIndex);
 
@@ -94,7 +62,6 @@ main(int argc, char **argv)
     char **av = argv;
     struct sockaddr_in host;
     register afs_int32 code;
-    extern struct hostent *gethostbyname();
     struct hostent *hp;
     char *hostname;
     char hnamebuf[200];
@@ -106,7 +73,7 @@ main(int argc, char **argv)
        printf("usage: pxclient <serverHost>\n");
        exit(1);
     }
-    memset((char *)&host, 0, sizeof(struct sockaddr_in));
+    memset(&host, 0, sizeof(struct sockaddr_in));
     host.sin_family = AF_INET;
     host.sin_addr.s_addr = inet_addr(av[0]);
 #ifdef STRUCT_SOCKADDR_HAS_SA_LEN
@@ -134,7 +101,7 @@ main(int argc, char **argv)
     code = ubik_Call(RXAFS_GetTime, cstruct, 0, &tv.tv_sec, &tv.tv_usec);
     if (!code)
        printf("AFS_GetTime on %s sec=%ld, usec=%ld\n", av[0], tv.tv_sec,
-              tv.tv_usec);
+              (long int)tv.tv_usec);
     else
        printf("return code is %d\n", code);
 
@@ -253,6 +220,7 @@ main(int argc, char **argv)
        }
     }
 #endif
+    return 0;
 }