- fixed pam_tally usage

[packages/XFree86.git] / XFree86-xfs-logger.patch

diff --git a/XFree86-xfs-logger.patch b/XFree86-xfs-logger.patch
index 5cbe5fde1063e720a3db1f45aafd5769d5c0ee42..c54b41caeefe65087adb98f27656fbeefc86c28e 100644 (file)
--- a/XFree86-xfs-logger.patch
+++ b/XFree86-xfs-logger.patch
@@ -1,16 +1,14 @@
 diff -Nur xc/programs/xfs.org/difs/main.c xc/programs/xfs/difs/main.c
 --- xc/programs/xfs.org/difs/main.c    Fri Apr  7 10:14:45 2000
 +++ xc/programs/xfs/difs/main.c        Fri Apr  7 10:02:01 2000
-@@ -56,6 +56,9 @@
+@@ -56,6 +56,7 @@
  #include      "dispatch.h"
  #include      "extentst.h"
  #include      "difs.h"
-+
 +#include      "debug.h"
-+
- #include <unistd.h>
- #include <pwd.h>
- #include <sys/types.h>
+ 
+ char       *ConnectionInfo;
+ int         ConnInfoLen;
 @@ -77,6 +80,7 @@
  static Bool create_connection_block(void);
  
@@ -20,13 +18,13 @@ diff -Nur xc/programs/xfs.org/difs/main.c xc/programs/xfs/difs/main.c
  
  extern OldListenRec *OldListen;
 @@ -92,6 +96,7 @@
-     argvGlobal = argv;
-     droppriv = 0;
-     becomeDaemon = 0;
+     int         i, oldumask;
+ 
+     argcGlobal = argc;
 +    debug_level = 0;
+     argvGlobal = argv;
  
      configfilename = DEFAULT_CONFIG_FILE;
- 
 diff -Nur xc/programs/xfs.org/include/debug.h xc/programs/xfs/include/debug.h
 --- xc/programs/xfs.org/include/debug.h        Thu Jan  1 01:00:00 1970
 +++ xc/programs/xfs/include/debug.h    Fri Apr  7 10:02:35 2000
@@ -37,19 +35,19 @@ diff -Nur xc/programs/xfs.org/os/utils.c xc/programs/xfs/os/utils.c
 --- xc/programs/xfs.org/os/utils.c     Fri Apr  7 10:14:45 2000
 +++ xc/programs/xfs/os/utils.c Fri Apr  7 10:04:38 2000
 @@ -91,6 +91,7 @@
- #endif
+ #include <stdlib.h>
  
  extern char *configfilename;
 +extern int  debug_level;
- extern int  droppriv; /* whether or not to drop root privileges */
- extern int  becomeDaemon; /* whether to become a daemon or not */
- char       *progname;
+ static Bool dropPriv = FALSE; /* whether or not to drop root privileges */
+ #ifdef DEFAULT_DAEMON
+ static Bool becomeDaemon = TRUE; /* whether to become a daemon or not */
 @@ -191,7 +192,7 @@
  static void
  usage(void)
  {
--    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon]\n",
-+    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-d debug_level]\n",
+-    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-nodaemon] [-user user_name] [-ls listen_socket]\n",
++    fprintf(stderr, "usage: %s [-config config_file] [-port tcp_port] [-droppriv] [-daemon] [-nodaemon] [-user user_name] [-ls listen_socket] [-d debug_level]\n",
            progname);
      exit(1);
  }