Changeset 3

Timestamp:

Sep 30, 2006, 5:15:09 PM (18 years ago)

Author:

jbarnold

Message:

Added missing bashrc file; added env cleaning

Location:

server

Files:

• common/oursrc/lockeradm/bashrc (added)
• common/oursrc/sqladm/signup-sql.c (modified) (2 diffs)
• fedora/specs/lockeradm.spec (modified) (2 diffs)

server/common/oursrc/sqladm/signup-sql.c

@@ -30 +30 @@
         }
 
+#define NUMBUF 5
+#define BUFLEN 128
+        char buf[NUMBUF][BUFLEN];
+        char *env[NUMBUF+1];
+        int i = 0;
+        snprintf(buf[i++], BUFLEN-1, "%s=%s", "HOME", "/home/sql");
+        snprintf(buf[i++], BUFLEN-1, "%s=%s", "TERM", "xterm");
+        snprintf(buf[i++], BUFLEN-1, "%s=%s", "USER", "sql");
+        snprintf(buf[i++], BUFLEN-1, "%s=%s", "SHELL", "/usr/local/bin/bash");
+        snprintf(buf[i++], BUFLEN-1, "%s=%s", "PATH", "/usr/kerberos/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin");
+        for(i = 0; i < NUMBUF; i++) {
+                env[i] = buf[i];
+        }
+        env[i] = NULL;
+
         char uid[21]; // 64-bit uid requires 21
         char gid[21]; // 64-bit gid requires 21
@@ -56 +71 @@
         }
 
-        execv(SIGNUP_PATH, v);
+        execle(SIGNUP_PATH, v, env);
         return 1;
 }

server/fedora/specs/lockeradm.spec

@@ -32 +32 @@
 install -D signup-scripts-frontend $RPM_BUILD_ROOT/usr/local/sbin/signup-scripts-frontend
 install -D signup-scripts-backend $RPM_BUILD_ROOT/usr/local/sbin/signup-scripts-backend
+install -D bashrc $RPM_BUILD_ROOT/usr/local/etc/bashrc
 
 %clean
@@ -38 +39 @@
 %files
 %defattr(0644, root, root)
+/usr/local/etc/bashrc
 %defattr(0755, root, root)
 /usr/local/sbin/admof