From: zacheiss <zacheiss>
Date: Tue, 26 Feb 2008 22:03:54 +0000 (+0000)
Subject: This change escaped before its time.
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/237fb8633c62eec8718aa14d28ac9445f5d21336

This change escaped before its time.
---

diff --git a/regtape/common.pc b/regtape/common.pc
index 55ee0691..74299bca 100644
--- a/regtape/common.pc
+++ b/regtape/common.pc
@@ -68,7 +68,7 @@ void process_entry(struct entry *e, int secure)
   char ophone[USERS_OFFICE_PHONE_SIZE], dept[USERS_DEPARTMENT_SIZE];
   char haddr[USERS_HOME_ADDR_SIZE], hphone[USERS_HOME_PHONE_SIZE];
   char dfirst[USERS_FIRST_SIZE], dlast[USERS_LAST_SIZE];
-  char dmiddle[USERS_MIDDLE_SIZE], fullname[USERS_FULLNAME_SIZE];
+  char dmiddle[USERS_MIDDLE_SIZE];
   int id, status, fmodby, xnlen = USERS_XNAME_SIZE - 1;
   EXEC SQL END DECLARE SECTION;
 
@@ -86,9 +86,9 @@ void process_entry(struct entry *e, int secure)
 
   /* Get user info */
   EXEC SQL SELECT users_id, first, last, middle, type, office_addr,
-    office_phone, home_addr, home_phone, fullname, department, status, fmodby
+    office_phone, home_addr, home_phone, department, status, fmodby
     INTO :id, :dfirst, :dlast, :dmiddle, :type, :oaddr,
-    :ophone, :haddr, :hphone, :fullname, :dept, :status, :fmodby
+    :ophone, :haddr, :hphone, :dept, :status, :fmodby
     FROM users
     WHERE clearid = :sid AND status != 3;
   if (sqlfail())
@@ -203,15 +203,6 @@ void process_entry(struct entry *e, int secure)
       strlcpy(dept, e->dept, USERS_DEPARTMENT_SIZE);
     }
 
-  if (strncmp(strtrim(fullname), e->name, USERS_FULLNAME_SIZE - 1) &&
-      (*fullname || fmodby != id))
-    {
-      changed++;
-      com_err(whoami, 0, "Fullname for %s %s changed from \"%s\" to \"%s\"",
-	      first, last, fullname, e->name);
-      strlcpy(fullname, e->name, USERS_FULLNAME_SIZE);
-    }
-
   if (changed)
     {
       com_err(whoami, 0, "updating finger for %s %s", first, last);
@@ -219,8 +210,8 @@ void process_entry(struct entry *e, int secure)
 	SET office_addr = NVL(:oaddr, CHR(0)),
 	office_phone = NVL(:ophone, CHR(0)), home_addr = NVL(:haddr, CHR(0)),
 	home_phone = NVL(:hphone, CHR(0)), department = NVL(:dept, CHR(0)),
-	fullname = NVL(:fullname, CHR(0)), fmodtime = SYSDATE, fmodby = :who,
-	fmodwith = :prog, xname = NVL(SUBSTR(:name, 0, :xnlen), CHR(0)),
+	fmodtime = SYSDATE, fmodby = :who, fmodwith = :prog,
+	xname = NVL(SUBSTR(:name, 0, :xnlen), CHR(0)),
 	xdept = NVL(:dept, CHR(0)), xtitle = NVL(:xtitle, CHR(0)),
 	xaddress = NVL(:xaddr, CHR(0)), xphone1 = NVL(:xphone1, CHR(0)),
 	xphone2 = NVL(:xphone2, CHR(0)), xmodtime = SYSDATE