summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-04-03 17:23:22 +0200
committerGünther Deschner <gd@samba.org>2008-04-03 17:23:22 +0200
commite7553ab79ca7e68a9c66f0ffc1f8e93dedcf12b8 (patch)
tree34a2458dc924975d978e96218bfa6b0c89cb3784
parent3020cd44ad6ac6be2ddddde1334aefec2e6741a4 (diff)
downloadsamba-e7553ab79ca7e68a9c66f0ffc1f8e93dedcf12b8.tar.gz
samba-e7553ab79ca7e68a9c66f0ffc1f8e93dedcf12b8.tar.bz2
samba-e7553ab79ca7e68a9c66f0ffc1f8e93dedcf12b8.zip
Fix pam_winbind macros.
Guenther (This used to be commit 37091859126167e84e55afe8a32025ac0f65065e)
-rw-r--r--source3/nsswitch/pam_winbind.c4
-rw-r--r--source3/nsswitch/pam_winbind.h24
2 files changed, 14 insertions, 14 deletions
diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index 9a9bce7ad8..47e0e3cd12 100644
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -3,7 +3,7 @@
Copyright Andrew Tridgell <tridge@samba.org> 2000
Copyright Tim Potter <tpot@samba.org> 2000
Copyright Andrew Bartlett <abartlet@samba.org> 2002
- Copyright Guenther Deschner <gd@samba.org> 2005-2007
+ Copyright Guenther Deschner <gd@samba.org> 2005-2008
largely based on pam_userdb by Cristian Gafton <gafton@redhat.com> also
contains large slabs of code from pam_unix by Elliot Lee
@@ -2690,7 +2690,7 @@ struct pam_module _pam_winbind_modstruct = {
* Copyright (c) Andrew Tridgell <tridge@samba.org> 2000
* Copyright (c) Tim Potter <tpot@samba.org> 2000
* Copyright (c) Andrew Bartlettt <abartlet@samba.org> 2002
- * Copyright (c) Guenther Deschner <gd@samba.org> 2005-2007
+ * Copyright (c) Guenther Deschner <gd@samba.org> 2005-2008
* Copyright (c) Jan Rêkorajski 1999.
* Copyright (c) Andrew G. Morgan 1996-8.
* Copyright (c) Alex O. Yuriev, 1996.
diff --git a/source3/nsswitch/pam_winbind.h b/source3/nsswitch/pam_winbind.h
index 1725a895e0..be17a6fe45 100644
--- a/source3/nsswitch/pam_winbind.h
+++ b/source3/nsswitch/pam_winbind.h
@@ -122,14 +122,14 @@ do { \
#include "winbind_client.h"
-#define PAM_WB_REMARK_DIRECT(h,f,x)\
+#define PAM_WB_REMARK_DIRECT(c,x)\
{\
const char *error_string = NULL; \
error_string = _get_ntstatus_error_string(x);\
if (error_string != NULL) {\
- _make_remark(h, f, PAM_ERROR_MSG, error_string);\
+ _make_remark(c, PAM_ERROR_MSG, error_string);\
} else {\
- _make_remark(h, f, PAM_ERROR_MSG, x);\
+ _make_remark(c, PAM_ERROR_MSG, x);\
};\
};
@@ -145,37 +145,37 @@ do { \
return ret;\
};
-#define PAM_WB_REMARK_CHECK_RESPONSE(h,f,x,y)\
+#define PAM_WB_REMARK_CHECK_RESPONSE(c,x,y)\
{\
const char *ntstatus = x.data.auth.nt_status_string; \
const char *error_string = NULL; \
if (!strcasecmp(ntstatus,y)) {\
error_string = _get_ntstatus_error_string(y);\
if (error_string != NULL) {\
- _make_remark(h, f, PAM_ERROR_MSG, error_string);\
+ _make_remark(c, PAM_ERROR_MSG, error_string);\
};\
if (x.data.auth.error_string[0] != '\0') {\
- _make_remark(h, f, PAM_ERROR_MSG, x.data.auth.error_string);\
+ _make_remark(c, PAM_ERROR_MSG, x.data.auth.error_string);\
};\
- _make_remark(h, f, PAM_ERROR_MSG, y);\
+ _make_remark(c, PAM_ERROR_MSG, y);\
};\
};
-#define PAM_WB_REMARK_CHECK_RESPONSE_RET(h,f,x,y)\
+#define PAM_WB_REMARK_CHECK_RESPONSE_RET(c,x,y)\
{\
const char *ntstatus = x.data.auth.nt_status_string; \
const char *error_string = NULL; \
if (!strcasecmp(ntstatus,y)) {\
error_string = _get_ntstatus_error_string(y);\
if (error_string != NULL) {\
- _make_remark(h, f, PAM_ERROR_MSG, error_string);\
+ _make_remark(c, PAM_ERROR_MSG, error_string);\
return ret;\
};\
if (x.data.auth.error_string[0] != '\0') {\
- _make_remark(h, f, PAM_ERROR_MSG, x.data.auth.error_string);\
+ _make_remark(c, PAM_ERROR_MSG, x.data.auth.error_string);\
return ret;\
};\
- _make_remark(h, f, PAM_ERROR_MSG, y);\
+ _make_remark(c, PAM_ERROR_MSG, y);\
return ret;\
};\
};
@@ -202,7 +202,7 @@ do { \
#define PAM_WB_GRACE_LOGON(x) ((NETLOGON_CACHED_ACCOUNT|NETLOGON_GRACE_LOGON) == ( x & (NETLOGON_CACHED_ACCOUNT|NETLOGON_GRACE_LOGON)))
struct pwb_context {
- const pam_handle_t *pamh;
+ pam_handle_t *pamh;
int flags;
int argc;
const char **argv;