Ignore:
Timestamp:
May 22, 2012, 10:52:35 PM (12 years ago)
Author:
ezyang
Message:
Merge changes from trunk.
Location:
branches/fc17-dev
Files:
2 deleted
10 edited
4 copied

Legend:

Unmodified
Added
Removed

  • branches/fc17-dev

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

    r1693 r2195  
    88sysconfdir = @sysconfdir@
    99
    10 all-local: admof signup-scripts-frontend
     10all-local: admof
    1111
    12 admof: admof.c
    13         $(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 $@
     12admof: LDLIBS = -lafsauthent_pic -lafsrpc_pic -lresolv -lkrb5 -lpthread
     13admof: admof.o
    1414
    1515install:
    … …  
    1818        install -p -m755 -D admof $(DESTDIR)$(bindir)/admof
    1919        install -p -m755 -D admof $(DESTDIR)$(sbindir)/ssh-admof
    20         install -p -m755 -D signup-scripts-frontend $(DESTDIR)$(sbindir)/signup-scripts-frontend
    2120        install -p -m755 -D signup-scripts-backend $(DESTDIR)$(sbindir)/signup-scripts-backend
    2221        install -p -m755 -D cronload $(DESTDIR)$(bindir)/cronload
    … …  
    2625
    2726clean:
    28         rm -f admof signup-scripts-frontend
     27        rm -f admof admof.o
    2928
    3029distclean: clean

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

    r1693 r2195  
    2121#include <unistd.h>
    2222#include <netinet/in.h>
     23#include <afs/stds.h>
    2324#include <afs/vice.h>
    2425#include <afs/venus.h>
    … …  
    9091    }
    9192
    92     /* Note: this first free probably should be xdr_free in OpenAFS 1.5.
    93      * See commits b40b606 and f02f2e8 */
    94     free(tids.idlist_val);
     93    xdr_free((xdrproc_t) xdr_idlist, &tids);
    9594    tids.idlist_val = NULL;
    9695    free(tnames.namelist_val);

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

    r731 r2195  
    1 AC_INIT(signup-scripts-frontend.c)
     1AC_INIT(signup-scripts-backend.in)
    22
    33AC_PROG_CC

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

    r544 r2195  
    11#!/bin/sh
    22
    3 rm -f signup-scripts-frontend admof signup-scripts-backend mbash
     3rm -f admof signup-scripts-backend mbash
    44rm -f configure config.* Makefile
    55rm -rf auto*.cache

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

    r1757 r2195  
    3232while (<BANNEDUSERS>) {
    3333    chomp;
    34     complain("banned username") if ($_ eq $username);
     34    complain("banned username") if (lc eq lc $username);
    3535}
    3636close(BANNEDUSERS);

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

    r2066 r2195  
    11[Unit]
    22Description=Scripts whois Service
    3 After=syslog.target
     3After=syslog.target dirsrv.service
    44
    55[Service]
    66Type=simple
    7 ExecStart=/usr/bin/twistd --nodaemon -l /var/log/scripts-whoisd.log -y /usr/local/libexec/whoisd.tac
     7ExecStart=/usr/bin/twistd --nodaemon -l /var/log/scripts-whoisd.log --pidfile /var/run/whoisd.pid -y /usr/local/libexec/whoisd.tac
    88
    99[Install]

  • branches/fc17-dev/server/common/patches/httpd-suexec-scripts.patch

    r1877 r2195  
    314314         exit(121);
    315315     }
    316 @@ -614,6 +767,23 @@
     316@@ -614,6 +767,30 @@
    317317     /*
    318318      * Execute the command, replacing our image with its own.
    … …  
    331331+        argv[1] = PHP_PATH;
    332332+        argv[2] = "-f";
     333+        /*
     334+         * argv[3] is the command to run. argv[4] is either an argument or
     335+         * already null. We don't want to pass any arguments through from
     336+         * Apache (since they're untrusted), so we chop off the remainder
     337+         * of argv here.
     338+         */
     339+        argv[4] = 0;
    333340+        execv(PHP_PATH, &argv[1]);
    334341+        log_err("(%d)%s: php exec failed (%s)\n", errno, strerror(errno), argv[1]);

  • branches/fc17-dev/server/common/patches/openafs-systemd-crond.patch

    r2066 r2195  
    1414 
    1515 [Install]
    16 -WantedBy=multi-user.target
    17 +WantedBy=multi-user.target crond.service
     16-WantedBy=multi-user.target remote-fs.target
     17+WantedBy=multi-user.target remote-fs.target crond.service

  • branches/fc17-dev/server/common/patches/openafs-systemd.patch

    r2066 r2195  
    3232+
    3333+[Install]
    34 +WantedBy=multi-user.target
     34+WantedBy=multi-user.target remote-fs.target
    3535diff --git a/src/packaging/RedHat/openafs-server.service b/src/packaging/RedHat/openafs-server.service
    3636new file mode 100644
Note: See TracChangeset for help on using the changeset viewer.