Changeset 342 for branches/samba-3.3.x/source/pam_smbpass

Timestamp:

Oct 30, 2009, 9:39:05 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 to 3.3.9

Location:

branches/samba-3.3.x/source/pam_smbpass

Files:

• pam_smb_auth.c (modified) (2 diffs)
• pam_smb_passwd.c (modified) (1 diff)
• support.c (modified) (9 diffs)
• support.h (modified) (1 diff)

branches/samba-3.3.x/source/pam_smbpass/pam_smb_auth.c

@@ -180 +180 @@
         retval = PAM_SUCCESS;
 
-        pam_get_data(pamh, "smb_setcred_return", (const void **) &pretval);
+        _pam_get_data(pamh, "smb_setcred_return", &pretval);
         if(pretval) {
                 retval = *pretval;
@@ -200 +200 @@
 
         /* Get the authtok; if we don't have one, silently fail. */
-        retval = pam_get_item( pamh, PAM_AUTHTOK, (const void **) &pass );
+        retval = _pam_get_item( pamh, PAM_AUTHTOK, &pass );
 
         if (retval != PAM_SUCCESS) {

branches/samba-3.3.x/source/pam_smbpass/pam_smb_passwd.c

@@ -230 +230 @@
 
         if (off( SMB_NOT_SET_PASS, ctrl )) {
-            retval = pam_get_item( pamh, PAM_OLDAUTHTOK,
-                                   (const void **)&pass_old );
+            retval = _pam_get_item( pamh, PAM_OLDAUTHTOK,
+                                   &pass_old );
         } else {
-            retval = pam_get_data( pamh, _SMB_OLD_AUTHTOK,
-                                   (const void **)&pass_old );
+            retval = _pam_get_data( pamh, _SMB_OLD_AUTHTOK,
+                                   &pass_old );
             if (retval == PAM_NO_MODULE_DATA) {
                 pass_old = NULL;

branches/samba-3.3.x/source/pam_smbpass/support.c

@@ -84 +84 @@
         struct pam_conv *conv;
 
-        retval = pam_get_item(pamh, PAM_CONV, (const void **) &conv);
+        retval = _pam_get_item(pamh, PAM_CONV, &conv);
         if (retval == PAM_SUCCESS) {
 
@@ -277 +277 @@
             /* log the number of authentication failures */
             if (failure->count != 0) {
-                pam_get_item( pamh, PAM_SERVICE, (const void **) &service );
+                _pam_get_item( pamh, PAM_SERVICE, &service );
                 _log_err( LOG_NOTICE
                           , "%d authentication %s "
@@ -333 +333 @@
             const char *service;
 
-            pam_get_item( pamh, PAM_SERVICE, (const void **)&service );
+            _pam_get_item( pamh, PAM_SERVICE, &service );
             _log_err( LOG_NOTICE, "failed auth request by %s for service %s as %s",
                       uidtoname(getuid()), service ? service : "**unknown**", name);
@@ -368 +368 @@
         const char *service;
 
-        pam_get_item( pamh, PAM_SERVICE, (const void **)&service );
+        _pam_get_item( pamh, PAM_SERVICE, &service );
 
         if (data_name != NULL) {
@@ -381 +381 @@
 
                 /* any previous failures for this user ? */
-                pam_get_data(pamh, data_name, (const void **) &old);
+                _pam_get_data(pamh, data_name, &old);
 
                 if (old != NULL) {
@@ -486 +486 @@
 
     if (on(SMB_TRY_FIRST_PASS, ctrl) || on(SMB_USE_FIRST_PASS, ctrl)) {
-        retval = pam_get_item( pamh, authtok_flag, (const void **) &item );
+        retval = _pam_get_item( pamh, authtok_flag, &item );
         if (retval != PAM_SUCCESS) {
             /* very strange. */
@@ -579 +579 @@
         _pam_delete( token );           /* clean it up */
         if (retval != PAM_SUCCESS
-            || (retval = pam_get_item( pamh, authtok_flag
-                            ,(const void **)&item )) != PAM_SUCCESS)
+            || (retval = _pam_get_item( pamh, authtok_flag
+                            ,&item )) != PAM_SUCCESS)
         {
             _log_err( LOG_CRIT, "error manipulating password" );
@@ -593 +593 @@
         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, &item ))
                              != PAM_SUCCESS)
         {
@@ -631 +631 @@
     return PAM_SUCCESS;
 }
+
+/*
+ * Work around the pam API that has functions with void ** as parameters
+ * These lead to strict aliasing warnings with gcc.
+ */
+int _pam_get_item(const pam_handle_t *pamh,
+                  int item_type,
+                  const void *_item)
+{
+        const void **item = (const void **)_item;
+        return pam_get_item(pamh, item_type, item);
+}
+
+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);
+}

branches/samba-3.3.x/source/pam_smbpass/support.h

@@ -49 +49 @@
 extern int _pam_smb_approve_pass(pam_handle_t *, unsigned int, const char *,
                                  const char *);
+
+int _pam_get_item(const pam_handle_t *pamh,
+                  int item_type,
+                  const void *_item);
+int _pam_get_data(const pam_handle_t *pamh,
+                  const char *module_data_name,
+                  const void *_data);