Relevant BUGIDs:

Purpose of commit: bugfix

Commit summary:
---------------
pam_unix: nis option shouldn't clear the shadow option

diff --git a/CHANGELOG b/CHANGELOG
index 93dba7ceec480d6ccc44f42a7bb0a4294b8a7a6a..8141c377fa4340bfdc4a1a4fa45d2c71aff4612f 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -67,6 +67,7 @@ BerliOS Bugs are marked with (BerliOS #XXXX).
   should be changed if possible (t8m)
 * misc_conv: flush input first then print the prompt - fixes problem
   with expect scripts (t8m)
+* pam_unix: nis option shouldn't clear the shadow option (t8m)
 
 0.79: Thu Mar 31 16:48:45 CEST 2005
 * pam_tally: added audit option (toady)

diff --git a/modules/pam_unix/support.h b/modules/pam_unix/support.h
index b2aa4b409a980f57223e48b38a52c78d4e205328..956ef59e5e0d3d72ee0820fd5788648b08041df5 100644 (file)
--- a/modules/pam_unix/support.h
+++ b/modules/pam_unix/support.h
@@ -110,7 +110,7 @@ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] =
 /* UNIX__NULLOK */         {"nullok",          _ALL_ON_^(01000),           0},
 /* UNIX_DEBUG */           {"debug",           _ALL_ON_,              040000},
 /* UNIX_NODELAY */         {"nodelay",         _ALL_ON_,             0100000},
-/* UNIX_NIS */             {"nis",             _ALL_ON_^(010000),    0200000},
+/* UNIX_NIS */             {"nis",             _ALL_ON_,             0200000},
 /* UNIX_BIGCRYPT */        {"bigcrypt",        _ALL_ON_^(020000),    0400000},
 /* UNIX_LIKE_AUTH */       {"likeauth",        _ALL_ON_,            01000000},
 /* UNIX_REMEMBER_PASSWD */ {"remember=",       _ALL_ON_,            02000000},