1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
--- pam_smbpass/general.h.orig Fri Feb 25 18:59:30 2005
+++ pam_smbpass/general.h Mon Jan 2 03:47:49 2006
@@ -50,10 +50,6 @@
#define set(x,ctrl) (ctrl = ((ctrl)&smb_args[x].mask)|smb_args[x].flag)
#define unset(x,ctrl) (ctrl &= ~(smb_args[x].flag))
-#ifndef __linux__
-#define strncasecmp(s1,s2,n) StrnCaseCmp(s1,s2,n)
-#endif
-
/* the generic mask */
#define _ALL_ON_ (~0U)
--- pam_smbpass/pam_smb_auth.c.orig Tue Oct 18 04:44:59 2005
+++ pam_smbpass/pam_smb_auth.c Mon Jan 2 03:47:49 2006
@@ -163,7 +163,7 @@
retval = PAM_SUCCESS;
- pam_get_data(pamh, "smb_setcred_return", (const void **) &pretval);
+ pam_get_data(pamh, "smb_setcred_return", (void **) &pretval);
if(pretval) {
retval = *pretval;
SAFE_FREE(pretval);
--- pam_smbpass/pam_smb_passwd.c.orig Thu Jul 28 15:19:44 2005
+++ pam_smbpass/pam_smb_passwd.c Mon Jan 2 03:47:49 2006
@@ -224,7 +224,7 @@
(const void **)&pass_old );
} else {
retval = pam_get_data( pamh, _SMB_OLD_AUTHTOK,
- (const void **)&pass_old );
+ (void **)&pass_old );
if (retval == PAM_NO_MODULE_DATA) {
pass_old = NULL;
retval = PAM_SUCCESS;
--- pam_smbpass/support.c.orig Thu Jul 28 15:19:44 2005
+++ pam_smbpass/support.c Mon Jan 2 03:47:49 2006
@@ -114,7 +114,7 @@
struct pam_response *resp;
pmsg[0] = &msg[0];
- msg[0].msg = text;
+ msg[0].msg = CONST_DISCARD(char *, text);
msg[0].msg_style = type;
resp = NULL;
@@ -384,7 +384,7 @@
if (newauth != NULL) {
/* any previous failures for this user ? */
- pam_get_data(pamh, data_name, (const void **) &old);
+ pam_get_data(pamh, data_name, (void **) &old);
if (old != NULL) {
newauth->count = old->count + 1;
@@ -515,7 +515,7 @@
if (comment != NULL && off(SMB__QUIET, ctrl)) {
pmsg[0] = &msg[0];
msg[0].msg_style = PAM_TEXT_INFO;
- msg[0].msg = comment;
+ msg[0].msg = CONST_DISCARD(char *, comment);
i = 1;
} else {
i = 0;
@@ -523,12 +523,12 @@
pmsg[i] = &msg[i];
msg[i].msg_style = PAM_PROMPT_ECHO_OFF;
- msg[i++].msg = prompt1;
+ msg[i++].msg = CONST_DISCARD(char *, prompt1);
if (prompt2 != NULL) {
pmsg[i] = &msg[i];
msg[i].msg_style = PAM_PROMPT_ECHO_OFF;
- msg[i++].msg = prompt2;
+ msg[i++].msg = CONST_DISCARD(char *, prompt2);
expect = 2;
} else
expect = 1;
@@ -594,7 +594,7 @@
retval = pam_set_data( pamh, data_name, (void *) token, _cleanup );
if (retval != PAM_SUCCESS
- || (retval = pam_get_data( pamh, data_name, (const void **)&item ))
+ || (retval = pam_get_data( pamh, data_name, (void **)&item ))
!= PAM_SUCCESS)
{
_log_err( LOG_CRIT, "error manipulating password data [%s]"
|
