ubik: Introduce ugen_secproc_func

[openafs.git] / src / ubik / uinit.c

diff --git a/src/ubik/uinit.c b/src/ubik/uinit.c
index ca83acc..1467cfb 100644 (file)
--- a/src/ubik/uinit.c
+++ b/src/ubik/uinit.c
@@ -25,14 +25,14 @@
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
 #include <afs/keys.h>
-#include <ubik.h>
+#include "ubik.h"
 #include <afs/afsint.h>
 #include <afs/cmd.h>
 
 static int
 internal_client_init(struct afsconf_dir *dir, struct afsconf_cell *info,
                     int secFlags, struct ubik_client **uclientp,
-                    int (*secproc) (struct rx_securityClass *, afs_int32),
+                    ugen_secproc_func secproc,
                     int maxservers, const char *serviceid, int deadtime,
                     afs_uint32 server, afs_uint32 port, afs_int32 usrvid)
 {
@@ -93,9 +93,10 @@ internal_client_init(struct afsconf_dir *dir, struct afsconf_cell *info,
     if (uclientp) {
        *uclientp = 0;
        code = ubik_ClientInit(serverconns, uclientp);
-       if (code)
+       if (code) {
            fprintf(stderr, "%s: ubik client init failed.\n", progname);
            return code;
+       }
     }
 
     return 0;
@@ -114,7 +115,7 @@ ugen_ClientInitCell(struct afsconf_dir *dir, struct afsconf_cell *info,
 static int
 internal_client_init_dir(const char *confDir, char *cellName, int secFlags,
                      struct ubik_client **uclientp,
-                     int (*secproc) (struct rx_securityClass *, afs_int32),
+                     ugen_secproc_func secproc,
                      afs_int32 maxservers, char *serviceid, afs_int32 deadtime,
                      afs_uint32 server, afs_uint32 port, afs_int32 usrvid)
 {
@@ -143,10 +144,9 @@ internal_client_init_dir(const char *confDir, char *cellName, int secFlags,
 
     code = afsconf_GetCellInfo(dir, cellName, serviceid, &info);
     if (code) {
+       fprintf(stderr, "%s: can't find cell %s's hosts in %s\n",
+               progname?progname:"<unknown>", cellName, dir->cellservDB);
        afsconf_Close(dir);
-       fprintf(stderr, "%s: can't find cell %s's hosts in %s/%s\n",
-               progname?progname:"<unknown>", cellName, confDir,
-               AFSDIR_CELLSERVDB_FILE);
        return code;
     }
 
@@ -174,7 +174,7 @@ ugen_ClientInitServer(const char *confDir, char *cellName, int secFlags,
 int
 ugen_ClientInitFlags(const char *confDir, char *cellName, int secFlags,
                     struct ubik_client **uclientp,
-                    int (*secproc) (struct rx_securityClass *, afs_int32),
+                    ugen_secproc_func secproc,
                     int maxservers, char *serviceid, int deadtime)
 {
     return internal_client_init_dir(confDir, cellName, secFlags, uclientp,
@@ -188,7 +188,7 @@ ugen_ClientInitFlags(const char *confDir, char *cellName, int secFlags,
 afs_int32
 ugen_ClientInit(int noAuthFlag, const char *confDir, char *cellName, afs_int32 sauth,
               struct ubik_client **uclientp,
-              int (*secproc) (struct rx_securityClass *, afs_int32),
+              ugen_secproc_func secproc,
               char *funcName, afs_int32 gen_rxkad_level,
               afs_int32 maxservers, char *serviceid, afs_int32 deadtime,
               afs_uint32 server, afs_uint32 port, afs_int32 usrvid)