summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Mraz <tm@t8m.info>2005-04-12 16:25:46 +0000
committerTomas Mraz <tm@t8m.info>2005-04-12 16:25:46 +0000
commit9c459446c2424d46622e95e4d54280fee0ef9607 (patch)
tree6b2bb4f59aa29588373811ab2d455888d512de24
parente1f17d96a0a058d5bb777cc05975ae39f9461174 (diff)
Relevant BUGIDs:
Purpose of commit: bugfix Commit summary: --------------- pam_unix: nis option shouldn't clear the shadow option
-rw-r--r--CHANGELOG1
-rw-r--r--modules/pam_unix/support.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 93dba7ce..8141c377 100644
--- 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 b2aa4b40..956ef59e 100644
--- 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},