[Pkg-cvs-commits] r14 - /trunk/patches/60_PAM_support

[93sam at users.alioth.debian.org]

Author: 93sam
Date: Fri May 19 23:53:12 2006
New Revision: 14

URL: http://svn.debian.org/wsvn/?sc=1&rev=14
Log:
Fix for SystemAuth

Modified:
    trunk/patches/60_PAM_support

Modified: trunk/patches/60_PAM_support
URL: http://svn.debian.org/wsvn/trunk/patches/60_PAM_support?rev=14&op=diff
==============================================================================
--- trunk/patches/60_PAM_support (original)
+++ trunk/patches/60_PAM_support Fri May 19 23:53:12 2006
@@ -100,7 +100,7 @@ diff -ruN cvs-1.12.13-old/src/parseinfo.
  bool parse_error (const char *, unsigned int);
 diff -ruN cvs-1.12.13-old/src/server.c cvs-1.12.13/src/server.c
 --- cvs-1.12.13-old/src/server.c	2005-09-28 16:25:59.000000000 +0100
-+++ cvs-1.12.13/src/server.c	2006-05-20 00:02:10.000000000 +0100
++++ cvs-1.12.13/src/server.c	2006-05-20 00:45:14.000000000 +0100
 @@ -6919,6 +6919,15 @@
      {
          pam_stage = "get pam user";
@@ -135,7 +135,7 @@ diff -ruN cvs-1.12.13-old/src/server.c c
  #ifdef HAVE_PAM
 -    if (check_pam_password (&username, password))
 +    if ( (config->PamAuth && check_pam_password (&username, password)) ||
-+         (config->system_auth && check_system_password (&username, password)))
++         (config->system_auth && check_system_password (username, password)))
  #else /* !HAVE_PAM */
 -    if (check_system_password (username, password))
 +	if (config->system_auth && check_system_password (username, password))