Changeset 2195 for branches/fc17-dev/server/common/oursrc

Timestamp:

May 22, 2012, 10:52:35 PM (12 years ago)

Author:

ezyang

Message:

Merge changes from trunk.

Location:

branches/fc17-dev

Files:

• . (modified) (1 prop)
• server/common/oursrc/accountadm/Makefile.in (modified) (3 diffs)
• server/common/oursrc/accountadm/admof.c (modified) (2 diffs)
• server/common/oursrc/accountadm/configure.in (modified) (1 diff)
• server/common/oursrc/accountadm/mrproper (modified) (1 diff)
• server/common/oursrc/accountadm/signup-scripts-backend.in (modified) (1 diff)
• server/common/oursrc/accountadm/signup-scripts-frontend.c (deleted)
• server/common/oursrc/fuse-better-mousetrapfs (copied) (copied from trunk/server/common/oursrc/fuse-better-mousetrapfs)
• server/common/oursrc/whoisd/scripts-whoisd.service (modified) (1 diff)

branches/fc17-dev/server/common/oursrc/accountadm/Makefile.in

@@ -8 +8 @@
 sysconfdir = @sysconfdir@
 
-all-local: admof signup-scripts-frontend
+all-local: admof
 
-admof: admof.c
-        $(CC) $(CPPFLAGS) $(CFLAGS) $< -L/usr/lib/afs -L/usr/lib64/afs -lprot -lauth -lrxkad -lubik -laudit -lsys -lrx -llwp -lsys -lafsutil -lcom_err -lresolv -lkrb5 -ldes -o $@
+admof: LDLIBS = -lafsauthent_pic -lafsrpc_pic -lresolv -lkrb5 -lpthread
+admof: admof.o
 
 install:
@@ -18 +18 @@
         install -p -m755 -D admof $(DESTDIR)$(bindir)/admof
         install -p -m755 -D admof $(DESTDIR)$(sbindir)/ssh-admof
-        install -p -m755 -D signup-scripts-frontend $(DESTDIR)$(sbindir)/signup-scripts-frontend
         install -p -m755 -D signup-scripts-backend $(DESTDIR)$(sbindir)/signup-scripts-backend
         install -p -m755 -D cronload $(DESTDIR)$(bindir)/cronload
@@ -26 +25 @@
 
 clean:
-        rm -f admof signup-scripts-frontend
+        rm -f admof admof.o
 
 distclean: clean

branches/fc17-dev/server/common/oursrc/accountadm/admof.c

@@ -21 +21 @@
 #include <unistd.h>
 #include <netinet/in.h>
+#include <afs/stds.h>
 #include <afs/vice.h>
 #include <afs/venus.h>
@@ -90 +91 @@
     }
 
-    /* Note: this first free probably should be xdr_free in OpenAFS 1.5.
-     * See commits b40b606 and f02f2e8 */
-    free(tids.idlist_val);
+    xdr_free((xdrproc_t) xdr_idlist, &tids);
     tids.idlist_val = NULL;
     free(tnames.namelist_val);

branches/fc17-dev/server/common/oursrc/accountadm/configure.in

@@ -1 @@
-AC_INIT(signup-scripts-frontend.c)
+AC_INIT(signup-scripts-backend.in)
 
 AC_PROG_CC

branches/fc17-dev/server/common/oursrc/accountadm/mrproper

@@ -1 +1 @@
 #!/bin/sh
 
-rm -f signup-scripts-frontend admof signup-scripts-backend mbash
+rm -f admof signup-scripts-backend mbash
 rm -f configure config.* Makefile
 rm -rf auto*.cache

branches/fc17-dev/server/common/oursrc/accountadm/signup-scripts-backend.in

@@ -32 +32 @@
 while (<BANNEDUSERS>) {
     chomp;
-    complain("banned username") if ($_ eq $username);
+    complain("banned username") if (lc eq lc $username);
 }
 close(BANNEDUSERS);

branches/fc17-dev/server/common/oursrc/whoisd/scripts-whoisd.service

@@ -1 +1 @@
 [Unit]
 Description=Scripts whois Service
-After=syslog.target
+After=syslog.target dirsrv.service
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/twistd --nodaemon -l /var/log/scripts-whoisd.log -y /usr/local/libexec/whoisd.tac
+ExecStart=/usr/bin/twistd --nodaemon -l /var/log/scripts-whoisd.log --pidfile /var/run/whoisd.pid -y /usr/local/libexec/whoisd.tac
 
 [Install]