Remove `delete_user_by_uid' since it's never been used in any logs we have,

[moira.git] / regtape / students.pc

diff --git a/regtape/students.pc b/regtape/students.pc
index 4dcdf3bc92bfa2e483d9681badd02848b0b0bb06..f108c2eb1b78ea7519e27ab3f4b79836ba73229c 100644 (file)
--- a/regtape/students.pc
+++ b/regtape/students.pc
@@ -77,7 +77,7 @@ struct entry {
 char *whoami;
 int newfinger = 0;
 
-#define SQL_DUPLICATE 2112
+#define SQL_DUPLICATE -2112
 #define sqlfail() (sqlca.sqlcode && sqlca.sqlcode != 1403)
 
 main(argc, argv)
@@ -300,11 +300,13 @@ struct entry *e;
     }
 
     /* See if class changed: if it's different, and the value in the database
-     * is not STAFF or SIPB, then update the database.  Since they were on the
+     * is not STAFF or SIPBMEM, and the value from the tape is actually
+     * meaningful, then update the database.  Since they were on the
      * students tape, make the account usable.
      */
     if (strcmp(e->class, strtrim(class)) &&
-       strcmp(class, "STAFF") && strcmp(class, "SIPB")) {
+       strcmp(class, "STAFF") && strcmp(class, "SIPBMEM") &&
+       e->year[0]) {
        com_err(whoami, 0, "updating class for user %s %s from %s to %s",
                first, last, class, e->class);
        if (status == US_NOT_ALLOWED) status = US_NO_LOGIN_YET;