Changeset 11

Timestamp:

Oct 1, 2006, 3:37:19 PM (18 years ago)

Author:

jbarnold

Message:

Fixed various bugs discovered when testing packages
Improved OpenAFS kernel module patch

Location:

server

Files:

• common/oursrc/lockeradm/configure.in (modified) (3 diffs)
• common/oursrc/lockeradm/signup-scripts-backend.in (modified) (2 diffs)
• common/patches/openafs-scripts.patch (modified) (1 diff)
• fedora/Makefile (modified) (1 diff)
• fedora/specs/lockeradm.spec (modified) (3 diffs)

server/common/oursrc/lockeradm/configure.in

@@ -17 +17 @@
 AC_SUBST(grep_path)
 
+AC_PATH_PROG(sudo_path, sudo)
+AC_SUBST(sudo_path)
 AC_PATH_PROG(useradd_path, useradd)
 AC_SUBST(useradd_path)
@@ -27 +29 @@
 AC_SUBST(hesinfo_path)
 
-dnl Needed by bash.in
+dnl Needed by modbash.in
 
 AC_PATH_PROG(bash_path, bash)
@@ -35 +37 @@
 AC_OUTPUT(admof)
 AC_OUTPUT(signup-scripts-backend)
+AC_OUTPUT(modbash)

server/common/oursrc/lockeradm/signup-scripts-backend.in

@@ -48 +48 @@
 
 # Complain if user's uid is too low or too high
-complain("bad uid") unless($uid1 > @min_user_uid@ and $uid1 < (1 << 31));
+complain("bad uid") unless($uid1 > 110 and $uid1 < (1 << 31));
 
 # Run ls to confirm user's .scripts-signup file
@@ -71 +71 @@
 # Add user to /etc/passwd
 `@sudo_path@ -u root @groupadd_path@ -g '$gid1' '$username'`;
-`@sudo_path@ -u root @useradd_path@ -d '$homedir' -s '/usr/local/bin/bash' -u '$uid1' -g '$gid1' -G users '$username'`;
+`@sudo_path@ -u root @useradd_path@ -d '$homedir' -s '/usr/local/bin/modbash' -u '$uid1' -g '$gid1' -G users '$username'`;
 # Add disk quota for user
-`@sudo_path@ -u root @setquota_path@ '$username' 0 25000 0 10000`;
+`@sudo_path@ -u root @setquota_path@ '$username' 0 25000 0 10000 -a`;
 
 printexit("done", 0);

server/common/patches/openafs-scripts.patch

@@ -148 +148 @@
  
      AFS_STATCNT(afs_access);
-+    amode = amode & (VREAD | VWRITE);
++    amode = amode & ~VEXEC;
      afs_Trace3(afs_iclSetp, CM_TRACE_ACCESS, ICL_TYPE_POINTER, avc,
                ICL_TYPE_INT32, amode, ICL_TYPE_OFFSET,

server/fedora/Makefile

@@ -109 +109 @@
 
 $(allsrc): setup
+        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
         rpmbuild $(rpm_args) -ba ${tmp_specs}/$@*.spec
 

server/fedora/specs/lockeradm.spec

@@ -29 +29 @@
 %install
 [ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
+install -D modbashrc $RPM_BUILD_ROOT/usr/local/etc/modbashrc
+install -D modbash $RPM_BUILD_ROOT/usr/local/bin/modbash
 install -D admof $RPM_BUILD_ROOT/usr/local/sbin/admof
 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
@@ -39 +40 @@
 %files
 %defattr(0644, root, root)
-/usr/local/etc/bashrc
+/usr/local/etc/modbashrc
 %defattr(0755, root, root)
+/usr/local/bin/modbash
 /usr/local/sbin/admof
 /usr/local/sbin/signup-scripts-backend
@@ -54 +56 @@
 signup  ALL=(root) NOPASSWD: /usr/sbin/useradd
 signup  ALL=(root) NOPASSWD: /usr/sbin/groupadd
-signup  ALL=(root) NOPASSWD: /usr/sbin/edquota
+signup  ALL=(root) NOPASSWD: /usr/sbin/setquota
 END
+chmod 0440 /etc/sudoers
 
 %preun