summaryrefslogtreecommitdiff
path: root/net/samba32/files/patch-nsswitch__pam_winbind.c
diff options
context:
space:
mode:
authorTimur I. Bakeyev <timur@FreeBSD.org>2008-10-12 01:37:46 +0000
committerTimur I. Bakeyev <timur@FreeBSD.org>2008-10-12 01:37:46 +0000
commitc90dd9a0cfb4ca92b844795f5a8be202dab70ece (patch)
tree7393b1c4965488c02bd885f2cda1aed2cc86c5de /net/samba32/files/patch-nsswitch__pam_winbind.c
parent- update to 0.38 (diff)
Add new experimantal version of Samba 3.2.4
Notes
Notes: svn path=/head/; revision=221452
Diffstat (limited to 'net/samba32/files/patch-nsswitch__pam_winbind.c')
-rw-r--r--net/samba32/files/patch-nsswitch__pam_winbind.c39
1 files changed, 39 insertions, 0 deletions
diff --git a/net/samba32/files/patch-nsswitch__pam_winbind.c b/net/samba32/files/patch-nsswitch__pam_winbind.c
new file mode 100644
index 000000000000..be0b470971e7
--- /dev/null
+++ b/net/samba32/files/patch-nsswitch__pam_winbind.c
@@ -0,0 +1,39 @@
+--- ./nsswitch/pam_winbind.c.orig 2008-09-18 06:49:02.000000000 +0000
++++ ./nsswitch/pam_winbind.c 2008-10-10 00:42:10.000000000 +0000
+@@ -39,14 +39,14 @@
+ const void *_item)
+ {
+ const void **item = (const void **)_item;
+- return pam_get_item(pamh, item_type, item);
++ return pam_get_item((pam_handle_t *)pamh, item_type, item);
+ }
+ static int _pam_get_data(const pam_handle_t *pamh,
+ const char *module_data_name,
+ const void *_data)
+ {
+- const void **data = (const void **)_data;
+- return pam_get_data(pamh, module_data_name, data);
++ void **data = (void **)_data;
++ return pam_get_data((pam_handle_t *)pamh, module_data_name, data);
+ }
+
+ /* some syslogging */
+@@ -177,7 +177,7 @@
+ if (item_type != 0) {
+ pam_get_item(ctx->pamh, item_type, &data);
+ } else {
+- pam_get_data(ctx->pamh, key, &data);
++ _pam_get_data(ctx->pamh, key, data);
+ }
+ if (data != NULL) {
+ const char *type = (item_type != 0) ? "ITEM" : "DATA";
+@@ -2203,8 +2203,7 @@
+ ret = PAM_USER_UNKNOWN;
+ goto out;
+ case 0:
+- pam_get_data(pamh, PAM_WINBIND_NEW_AUTHTOK_REQD,
+- (const void **)&tmp);
++ _pam_get_data(pamh, PAM_WINBIND_NEW_AUTHTOK_REQD, tmp);
+ if (tmp != NULL) {
+ ret = atoi((const char *)tmp);
+ switch (ret) {