From ed389ee8dc9246b2d6c4e483cee16f7255b9a7f5 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 5 Feb 2002 09:40:36 +0000 Subject: Drastic impromvents to pam_winbind. This adds code to do generic PAM -> NTSTATUS and NTSTATUS -> PAM error conversions, and uses them to make the error handling in pam_winbind sane. In particular, pam_winbind now uses PAM error codes, not silly '-1, -2 ...' stuff, and logs the NTSTATUS error that winbind now sends over the pipe. Added code to wbinfo to display these - makes a big difference in debugging winbindd. The main change here is the code to allow pam_winbind password changing to correctly stack - This code ripped from pam_unix, and the copyright attached. (Same as for all pam modules, including pam_winbind) Andrew Bartlett (This used to be commit dc1a72f896b83bc1ad3c7bf6c12c36ace3967280) --- source3/lib/pam_errors.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 source3/lib/pam_errors.c (limited to 'source3/lib/pam_errors.c') diff --git a/source3/lib/pam_errors.c b/source3/lib/pam_errors.c new file mode 100644 index 0000000000..d7765c7c51 --- /dev/null +++ b/source3/lib/pam_errors.c @@ -0,0 +1,122 @@ +/* + * Unix SMB/CIFS implementation. + * PAM error mapping functions + * Copyright (C) Andrew Bartlett 2002 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include "includes.h" + +#ifdef WITH_PAM +#include + +/* PAM -> NT_STATUS map */ +static struct { + int pam_code; + NTSTATUS ntstatus; +} pam_to_nt_status_map[] = { + {PAM_OPEN_ERR, NT_STATUS_UNSUCCESSFUL}, + {PAM_SYMBOL_ERR, NT_STATUS_UNSUCCESSFUL}, + {PAM_SERVICE_ERR, NT_STATUS_UNSUCCESSFUL}, + {PAM_SYSTEM_ERR, NT_STATUS_UNSUCCESSFUL}, + {PAM_BUF_ERR, NT_STATUS_UNSUCCESSFUL}, + {PAM_PERM_DENIED, NT_STATUS_ACCESS_DENIED}, + {PAM_AUTH_ERR, NT_STATUS_WRONG_PASSWORD}, + {PAM_CRED_INSUFFICIENT, NT_STATUS_INSUFFICIENT_LOGON_INFO}, /* FIXME: Is this correct? */ + {PAM_AUTHINFO_UNAVAIL, NT_STATUS_LOGON_FAILURE}, + {PAM_USER_UNKNOWN, NT_STATUS_NO_SUCH_USER}, + {PAM_MAXTRIES, NT_STATUS_REMOTE_SESSION_LIMIT}, /* FIXME: Is this correct? */ + {PAM_NEW_AUTHTOK_REQD, NT_STATUS_PASSWORD_MUST_CHANGE}, + {PAM_ACCT_EXPIRED, NT_STATUS_ACCOUNT_EXPIRED}, + {PAM_SESSION_ERR, NT_STATUS_INSUFFICIENT_RESOURCES}, + {PAM_CRED_UNAVAIL, NT_STATUS_NO_TOKEN}, /* FIXME: Is this correct? */ + {PAM_CRED_EXPIRED, NT_STATUS_PASSWORD_EXPIRED}, /* FIXME: Is this correct? */ + {PAM_CRED_ERR, NT_STATUS_UNSUCCESSFUL}, + {PAM_AUTHTOK_ERR, NT_STATUS_UNSUCCESSFUL}, +#if defined(PAM_AUTHTOK_RECOVERY_ERR) && !defined(PAM_AUTHTOK_RECOVER_ERR) +#define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR +#endif + {PAM_AUTHTOK_RECOVER_ERR, NT_STATUS_UNSUCCESSFUL}, + {PAM_AUTHTOK_EXPIRED, NT_STATUS_PASSWORD_EXPIRED}, + {PAM_SUCCESS, NT_STATUS_OK} +}; + +/* NT_STATUS -> PAM map */ +static struct { + NTSTATUS ntstatus; + int pam_code; +} nt_status_to_pam_map[] = { + {NT_STATUS_UNSUCCESSFUL, PAM_SYSTEM_ERR}, + {NT_STATUS_NO_SUCH_USER, PAM_USER_UNKNOWN}, + {NT_STATUS_WRONG_PASSWORD, PAM_AUTH_ERR}, + {NT_STATUS_LOGON_FAILURE, PAM_AUTH_ERR}, + {NT_STATUS_ACCOUNT_EXPIRED, PAM_ACCT_EXPIRED}, + {NT_STATUS_PASSWORD_MUST_CHANGE, PAM_NEW_AUTHTOK_REQD}, + {NT_STATUS_OK, PAM_SUCCESS} +}; + +/***************************************************************************** +convert a PAM error to a NT status32 code + *****************************************************************************/ +NTSTATUS pam_to_nt_status(int pam_error) +{ + int i; + if (pam_error == 0) return NT_STATUS_OK; + + for (i=0; NT_STATUS_V(pam_to_nt_status_map[i].ntstatus); i++) { + if (pam_error == pam_to_nt_status_map[i].pam_code) + return pam_to_nt_status_map[i].ntstatus; + } + return NT_STATUS_UNSUCCESSFUL; +} + +/***************************************************************************** +convert an NT status32 code to a PAM error + *****************************************************************************/ +int nt_status_to_pam(NTSTATUS nt_status) +{ + int i; + if NT_STATUS_IS_OK(nt_status) return PAM_SUCCESS; + + for (i=0; NT_STATUS_V(nt_status_to_pam_map[i].ntstatus); i++) { + if (NT_STATUS_EQUAL(nt_status,nt_status_to_pam_map[i].ntstatus)) + return nt_status_to_pam_map[i].pam_code; + } + return PAM_SYSTEM_ERR; +} + +#else + +/***************************************************************************** +convert a PAM error to a NT status32 code + *****************************************************************************/ +NTSTATUS pam_to_ntstatus(int pam_error) +{ + if (pam_errno == 0) return NT_STATUS_OK; + return NT_STATUS_UNSUCCESSFUL; +} + +/***************************************************************************** +convert an NT status32 code to a PAM error + *****************************************************************************/ +int ntstatus_to_pam(NTSTATUS nt_status) +{ + if (nt_status == NT_STATUS_OK) return 0; + return 4; /* PAM_SYSTEM_ERR */ +} + +#endif + -- cgit From db0d2f8d6038f9d20429f2137986dc65d50137af Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 5 Feb 2002 21:05:04 +0000 Subject: See if we can get slightly valid C for the non-PAM case here. Andrew Bartlett (This used to be commit 59afc3d6daad2770219dba1ca113869967eefc23) --- source3/lib/pam_errors.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/lib/pam_errors.c') diff --git a/source3/lib/pam_errors.c b/source3/lib/pam_errors.c index d7765c7c51..ef0e850904 100644 --- a/source3/lib/pam_errors.c +++ b/source3/lib/pam_errors.c @@ -105,7 +105,7 @@ convert a PAM error to a NT status32 code *****************************************************************************/ NTSTATUS pam_to_ntstatus(int pam_error) { - if (pam_errno == 0) return NT_STATUS_OK; + if (pam_error == 0) return NT_STATUS_OK; return NT_STATUS_UNSUCCESSFUL; } @@ -114,7 +114,7 @@ convert an NT status32 code to a PAM error *****************************************************************************/ int ntstatus_to_pam(NTSTATUS nt_status) { - if (nt_status == NT_STATUS_OK) return 0; + if (NT_STATUS_EQUAL(nt_status, NT_STATUS_OK)) return 0; return 4; /* PAM_SYSTEM_ERR */ } -- cgit From 72b1011cb280c3dfc24e4c487bef231e2e5de357 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 6 Feb 2002 20:31:26 +0000 Subject: Try to get this finally working. (Note to self: *always* check build farm...) :-) Andrew Bartlett (This used to be commit 542e0e37455e6bcd8e0c248b3bb6ede8306d1656) --- source3/lib/pam_errors.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/lib/pam_errors.c') diff --git a/source3/lib/pam_errors.c b/source3/lib/pam_errors.c index ef0e850904..f0f47333cb 100644 --- a/source3/lib/pam_errors.c +++ b/source3/lib/pam_errors.c @@ -103,7 +103,7 @@ int nt_status_to_pam(NTSTATUS nt_status) /***************************************************************************** convert a PAM error to a NT status32 code *****************************************************************************/ -NTSTATUS pam_to_ntstatus(int pam_error) +NTSTATUS pam_to_nt_status(int pam_error) { if (pam_error == 0) return NT_STATUS_OK; return NT_STATUS_UNSUCCESSFUL; @@ -112,7 +112,7 @@ NTSTATUS pam_to_ntstatus(int pam_error) /***************************************************************************** convert an NT status32 code to a PAM error *****************************************************************************/ -int ntstatus_to_pam(NTSTATUS nt_status) +int nt_status_to_pam(NTSTATUS nt_status) { if (NT_STATUS_EQUAL(nt_status, NT_STATUS_OK)) return 0; return 4; /* PAM_SYSTEM_ERR */ -- cgit From 33dd5128961f2a39cd70c7b6766a524aba2443d7 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 23 Mar 2002 08:45:03 +0000 Subject: Make a number of the lookup tables 'const'. I'm told this assists in sharing memory between users of shared libs. Andrew Bartlett (This used to be commit 41dd5a4d292bb08fa313f6220014cd9b4490237b) --- source3/lib/pam_errors.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/lib/pam_errors.c') diff --git a/source3/lib/pam_errors.c b/source3/lib/pam_errors.c index f0f47333cb..1971e3b763 100644 --- a/source3/lib/pam_errors.c +++ b/source3/lib/pam_errors.c @@ -24,7 +24,7 @@ #include /* PAM -> NT_STATUS map */ -static struct { +const static struct { int pam_code; NTSTATUS ntstatus; } pam_to_nt_status_map[] = { @@ -55,7 +55,7 @@ static struct { }; /* NT_STATUS -> PAM map */ -static struct { +const static struct { NTSTATUS ntstatus; int pam_code; } nt_status_to_pam_map[] = { -- cgit From 6bd2b496ed07e535cc199b983e7a6321ce6855f4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 1 Apr 2002 07:16:06 +0000 Subject: cope with a missing PAM define (This used to be commit e5c3648fe721d659c8b90a6987998ada4790592b) --- source3/lib/pam_errors.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'source3/lib/pam_errors.c') diff --git a/source3/lib/pam_errors.c b/source3/lib/pam_errors.c index 1971e3b763..f74e4bf176 100644 --- a/source3/lib/pam_errors.c +++ b/source3/lib/pam_errors.c @@ -23,6 +23,10 @@ #ifdef WITH_PAM #include +#if defined(PAM_AUTHTOK_RECOVERY_ERR) && !defined(PAM_AUTHTOK_RECOVER_ERR) +#define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR +#endif + /* PAM -> NT_STATUS map */ const static struct { int pam_code; @@ -46,10 +50,9 @@ const static struct { {PAM_CRED_EXPIRED, NT_STATUS_PASSWORD_EXPIRED}, /* FIXME: Is this correct? */ {PAM_CRED_ERR, NT_STATUS_UNSUCCESSFUL}, {PAM_AUTHTOK_ERR, NT_STATUS_UNSUCCESSFUL}, -#if defined(PAM_AUTHTOK_RECOVERY_ERR) && !defined(PAM_AUTHTOK_RECOVER_ERR) -#define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR -#endif +#ifdef PAM_AUTHTOK_RECOVER_ERR {PAM_AUTHTOK_RECOVER_ERR, NT_STATUS_UNSUCCESSFUL}, +#endif {PAM_AUTHTOK_EXPIRED, NT_STATUS_PASSWORD_EXPIRED}, {PAM_SUCCESS, NT_STATUS_OK} }; -- cgit From e90b65284812aaa5ff9e9935ce9bbad7791cbbcd Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 15 Jul 2002 10:35:28 +0000 Subject: updated the 3.0 branch from the head branch - ready for alpha18 (This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce) --- source3/lib/pam_errors.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/lib/pam_errors.c') diff --git a/source3/lib/pam_errors.c b/source3/lib/pam_errors.c index f74e4bf176..e1d02151a6 100644 --- a/source3/lib/pam_errors.c +++ b/source3/lib/pam_errors.c @@ -67,6 +67,7 @@ const static struct { {NT_STATUS_WRONG_PASSWORD, PAM_AUTH_ERR}, {NT_STATUS_LOGON_FAILURE, PAM_AUTH_ERR}, {NT_STATUS_ACCOUNT_EXPIRED, PAM_ACCT_EXPIRED}, + {NT_STATUS_PASSWORD_EXPIRED, PAM_AUTHTOK_EXPIRED}, {NT_STATUS_PASSWORD_MUST_CHANGE, PAM_NEW_AUTHTOK_REQD}, {NT_STATUS_OK, PAM_SUCCESS} }; -- cgit From 634c54310c92c48dd4eceec602e230a021bdcfc5 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 3 Jan 2003 08:28:12 +0000 Subject: Merge from HEAD - make Samba compile with -Wwrite-strings without additional warnings. (Adds a lot of const). Andrew Bartlett (This used to be commit 3a7458f9472432ef12c43008414925fd1ce8ea0c) --- source3/lib/pam_errors.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/lib/pam_errors.c') diff --git a/source3/lib/pam_errors.c b/source3/lib/pam_errors.c index e1d02151a6..925441fb1d 100644 --- a/source3/lib/pam_errors.c +++ b/source3/lib/pam_errors.c @@ -28,7 +28,7 @@ #endif /* PAM -> NT_STATUS map */ -const static struct { +static const struct { int pam_code; NTSTATUS ntstatus; } pam_to_nt_status_map[] = { @@ -58,7 +58,7 @@ const static struct { }; /* NT_STATUS -> PAM map */ -const static struct { +static const struct { NTSTATUS ntstatus; int pam_code; } nt_status_to_pam_map[] = { -- cgit From 8be4584979e0ad5ae4b4da59c032b462eebf9021 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 26 Jan 2004 08:38:34 +0000 Subject: Add a few more NTSTATUS <=> PAM error mappings. Andrew Bartlett (This used to be commit 7495cafd42617c0aa2ba9de69f87426ecacc1297) --- source3/lib/pam_errors.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/lib/pam_errors.c') diff --git a/source3/lib/pam_errors.c b/source3/lib/pam_errors.c index 925441fb1d..212d3831fd 100644 --- a/source3/lib/pam_errors.c +++ b/source3/lib/pam_errors.c @@ -36,7 +36,7 @@ static const struct { {PAM_SYMBOL_ERR, NT_STATUS_UNSUCCESSFUL}, {PAM_SERVICE_ERR, NT_STATUS_UNSUCCESSFUL}, {PAM_SYSTEM_ERR, NT_STATUS_UNSUCCESSFUL}, - {PAM_BUF_ERR, NT_STATUS_UNSUCCESSFUL}, + {PAM_BUF_ERR, NT_STATUS_NO_MEMORY}, {PAM_PERM_DENIED, NT_STATUS_ACCESS_DENIED}, {PAM_AUTH_ERR, NT_STATUS_WRONG_PASSWORD}, {PAM_CRED_INSUFFICIENT, NT_STATUS_INSUFFICIENT_LOGON_INFO}, /* FIXME: Is this correct? */ @@ -69,6 +69,8 @@ static const struct { {NT_STATUS_ACCOUNT_EXPIRED, PAM_ACCT_EXPIRED}, {NT_STATUS_PASSWORD_EXPIRED, PAM_AUTHTOK_EXPIRED}, {NT_STATUS_PASSWORD_MUST_CHANGE, PAM_NEW_AUTHTOK_REQD}, + {NT_STATUS_ACCOUNT_LOCKED_OUT, PAM_MAXTRIES}, + {NT_STATUS_NO_MEMORY, PAM_BUF_ERR}, {NT_STATUS_OK, PAM_SUCCESS} }; -- cgit From 0af1500fc0bafe61019f1b2ab1d9e1d369221240 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 3 Feb 2006 22:19:41 +0000 Subject: r13316: Let the carnage begin.... Sync with trunk as off r13315 (This used to be commit 17e63ac4ed8325c0d44fe62b2442449f3298559f) --- source3/lib/pam_errors.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/lib/pam_errors.c') diff --git a/source3/lib/pam_errors.c b/source3/lib/pam_errors.c index 212d3831fd..8a4c41d7df 100644 --- a/source3/lib/pam_errors.c +++ b/source3/lib/pam_errors.c @@ -71,6 +71,7 @@ static const struct { {NT_STATUS_PASSWORD_MUST_CHANGE, PAM_NEW_AUTHTOK_REQD}, {NT_STATUS_ACCOUNT_LOCKED_OUT, PAM_MAXTRIES}, {NT_STATUS_NO_MEMORY, PAM_BUF_ERR}, + {NT_STATUS_PASSWORD_RESTRICTION, PAM_PERM_DENIED}, {NT_STATUS_OK, PAM_SUCCESS} }; -- cgit From 3aec4cc13c0a4293e32e8c7dbb39894869c7269e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 15 Dec 2006 06:44:16 +0000 Subject: r20181: Improve NT status to pam error mapping. Jeremy. (This used to be commit 794ebd8a84115a636d8fa4a9f859f8a999135e5e) --- source3/lib/pam_errors.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source3/lib/pam_errors.c') diff --git a/source3/lib/pam_errors.c b/source3/lib/pam_errors.c index 8a4c41d7df..a761cf6d08 100644 --- a/source3/lib/pam_errors.c +++ b/source3/lib/pam_errors.c @@ -72,6 +72,13 @@ static const struct { {NT_STATUS_ACCOUNT_LOCKED_OUT, PAM_MAXTRIES}, {NT_STATUS_NO_MEMORY, PAM_BUF_ERR}, {NT_STATUS_PASSWORD_RESTRICTION, PAM_PERM_DENIED}, + {NT_STATUS_BACKUP_CONTROLLER, PAM_AUTHINFO_UNAVAIL}; + {NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND, PAM_AUTHINFO_UNAVAIL}; + {NT_STATUS_NO_LOGON_SERVERS, PAM_AUTHINFO_UNAVAIL}; + {NT_STATUS_INVALID_WORKSTATION, PAM_PERM_DENIED}, + {NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT, PAM_AUTHINFO_UNAVAIL}; + {NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT, PAM_AUTHINFO_UNAVAIL}; + {NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT, PAM_AUTHINFO_UNAVAIL}; {NT_STATUS_OK, PAM_SUCCESS} }; -- cgit From 69d4146042e6d35c439d1dd42e4b284d0ddcf1ef Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 15 Dec 2006 12:35:20 +0000 Subject: r20183: Fix the build. Guenther (This used to be commit fe3ed63d29e7a68413bffc11d634b61a664ed1a2) --- source3/lib/pam_errors.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/lib/pam_errors.c') diff --git a/source3/lib/pam_errors.c b/source3/lib/pam_errors.c index a761cf6d08..9d9a377a91 100644 --- a/source3/lib/pam_errors.c +++ b/source3/lib/pam_errors.c @@ -72,13 +72,13 @@ static const struct { {NT_STATUS_ACCOUNT_LOCKED_OUT, PAM_MAXTRIES}, {NT_STATUS_NO_MEMORY, PAM_BUF_ERR}, {NT_STATUS_PASSWORD_RESTRICTION, PAM_PERM_DENIED}, - {NT_STATUS_BACKUP_CONTROLLER, PAM_AUTHINFO_UNAVAIL}; - {NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND, PAM_AUTHINFO_UNAVAIL}; - {NT_STATUS_NO_LOGON_SERVERS, PAM_AUTHINFO_UNAVAIL}; + {NT_STATUS_BACKUP_CONTROLLER, PAM_AUTHINFO_UNAVAIL}, + {NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND, PAM_AUTHINFO_UNAVAIL}, + {NT_STATUS_NO_LOGON_SERVERS, PAM_AUTHINFO_UNAVAIL}, {NT_STATUS_INVALID_WORKSTATION, PAM_PERM_DENIED}, - {NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT, PAM_AUTHINFO_UNAVAIL}; - {NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT, PAM_AUTHINFO_UNAVAIL}; - {NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT, PAM_AUTHINFO_UNAVAIL}; + {NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT, PAM_AUTHINFO_UNAVAIL}, + {NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT, PAM_AUTHINFO_UNAVAIL}, + {NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT, PAM_AUTHINFO_UNAVAIL}, {NT_STATUS_OK, PAM_SUCCESS} }; -- cgit From f4ae28576376741a5402a286827a46c053db0ff7 Mon Sep 17 00:00:00 2001 From: James Peach Date: Wed, 23 May 2007 20:31:28 +0000 Subject: r23095: Support systems that have their PAM headers in /usr/include/pam. (This used to be commit f1e8de4b576b3954d456cb64c02417908bab8da4) --- source3/lib/pam_errors.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/lib/pam_errors.c') diff --git a/source3/lib/pam_errors.c b/source3/lib/pam_errors.c index 9d9a377a91..42931383ed 100644 --- a/source3/lib/pam_errors.c +++ b/source3/lib/pam_errors.c @@ -21,7 +21,11 @@ #include "includes.h" #ifdef WITH_PAM +#if defined(HAVE_SECURITY_PAM_APPL_H) #include +#elif defined(HAVE_PAM_PAM_APPL_H) +#include +#endif #if defined(PAM_AUTHTOK_RECOVERY_ERR) && !defined(PAM_AUTHTOK_RECOVER_ERR) #define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR -- cgit From d824b98f80ba186030cbb70b3a1e5daf80469ecd Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 9 Jul 2007 19:25:36 +0000 Subject: r23779: Change from v2 or later to v3 or later. Jeremy. (This used to be commit 407e6e695b8366369b7c76af1ff76869b45347b3) --- source3/lib/pam_errors.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/pam_errors.c') diff --git a/source3/lib/pam_errors.c b/source3/lib/pam_errors.c index 42931383ed..bf8fc1588a 100644 --- a/source3/lib/pam_errors.c +++ b/source3/lib/pam_errors.c @@ -5,7 +5,7 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, -- cgit From 153cfb9c83534b09f15cc16205d7adb19b394928 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 05:23:25 +0000 Subject: r23801: The FSF has moved around a lot. This fixes their Mass Ave address. (This used to be commit 87c91e4362c51819032bfbebbb273c52e203b227) --- source3/lib/pam_errors.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source3/lib/pam_errors.c') diff --git a/source3/lib/pam_errors.c b/source3/lib/pam_errors.c index bf8fc1588a..1073f269e5 100644 --- a/source3/lib/pam_errors.c +++ b/source3/lib/pam_errors.c @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, see . */ #include "includes.h" -- cgit