Resolve missing printf args

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

diff --git a/src/viced/viced.c b/src/viced/viced.c
index 5326a53..17cf1f8 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -56,6 +56,7 @@
 #include <afs/vnode.h>
 #include <afs/volume.h>
 #include <afs/auth.h>
+#include <afs/authcon.h>
 #include <afs/cellconfig.h>
 #include <afs/acl.h>
 #include <afs/prs_fs.h>
@@ -1217,7 +1218,7 @@ ParseArgs(int argc, char *argv[])
 #if defined(AFS_AIX32_ENV)
     if (cmd_OptionAsInt(opts, OPT_minspare, &aixlow_water) == 0) {
        if ((aixlow_water < 0) || (aixlow_water > 30)) {
-           printf("space reserved %d%% invalid; must be between 0-30%\n",
+           printf("space reserved %d%% invalid; must be between 0-30%%\n",
                   aixlow_water);
            return -1;
        }
@@ -1840,6 +1841,7 @@ main(int argc, char *argv[])
     char hoststr[16];
     afs_uint32 rx_bindhost;
     VolumePackageOptions opts;
+    struct afsconf_bsso_info bsso;
 
 #ifdef AFS_AIX32_ENV
     struct sigaction nsa;
@@ -1852,6 +1854,8 @@ main(int argc, char *argv[])
 #endif
     osi_audit_init();
 
+    memset(&bsso, 0, sizeof(bsso));
+
     /* Initialize dirpaths */
     if (!(initAFSDirPath() & AFSDIR_SERVER_PATHS_OK)) {
 #ifdef AFS_NT40_ENV
@@ -1897,14 +1901,6 @@ main(int argc, char *argv[])
 
     LogCommandLine(argc, argv, "starting", "", "File server", FSLog);
 
-    if (afsconf_CountKeys(confDir) == 0) {
-       ViceLog(0, ("WARNING: No encryption keys found! "
-                   "All authenticated accesses will fail. "
-                   "Run akeyconvert or asetkey to import encryption keys.\n"));
-    } else if (afsconf_GetLatestKey(confDir, NULL, NULL) == 0) {
-       LogDesWarning();
-    }
-
     /* initialize the pthread soft signal handler thread */
     opr_softsig_Init();
     SetupLogSoftSignals();
@@ -2033,7 +2029,11 @@ main(int argc, char *argv[])
     rx_GetIFInfo();
     rx_SetRxDeadTime(30);
     afsconf_SetSecurityFlags(confDir, AFSCONF_SECOPTS_ALWAYSENCRYPT);
-    afsconf_BuildServerSecurityObjects(confDir, &securityClasses, &numClasses);
+
+    bsso.dir = confDir;
+    bsso.logger = FSLog;
+    afsconf_BuildServerSecurityObjects_int(&bsso, &securityClasses,
+                                          &numClasses);
 
     tservice = rx_NewServiceHost(rx_bindhost,  /* port */ 0, /* service id */
                                 1,     /*service name */