Cope with the KDC returning an error indicating a weak password was

chosen by the user.

diff --git a/reg_svr/kerberos.c b/reg_svr/kerberos.c
index 21574864ebe1382b3db72605ee1c2f50053e5f58..870dfd416c20a80570b04852db01e4f32638edd6 100644 (file)
--- a/reg_svr/kerberos.c
+++ b/reg_svr/kerberos.c
@@ -149,6 +149,10 @@ cleanup:
 
   if (status == KADM5_DUP)
     return MR_IN_USE;
+  else if (status == KADM5_PASS_Q_TOOSHORT || 
+          status == KADM5_PASS_Q_CLASS ||
+          status == KADM5_PASS_Q_DICT)
+    return MR_QUALITY;
   else return status;
 }
 #endif

diff --git a/reg_svr/reg_svr.pc b/reg_svr/reg_svr.pc
index 8b15567a7a3b07c92efeb1a72df4e8f62c23e283..6c6b8f3c709cf255a1ea3a9484ce4037f78c89a6 100644 (file)
--- a/reg_svr/reg_svr.pc
+++ b/reg_svr/reg_svr.pc
@@ -595,7 +595,12 @@ void PSWD(reg_client *rc, int argc, char **argv)
     }
 
   status = register_kerberos(rc->username, password);
-  if (status == MR_IN_USE)
+  if (status == MR_QUALITY)
+    {
+      reply(rc, PASSWORD_SIMPLE, "GETP", "c", NULL);
+      return;
+    }
+  else if (status == MR_IN_USE)
     {
       reply(rc, RESERVED_USERNAME_UNAVAILABLE, "INIT", "c", NULL,
            rc->username);