Re: Ports broken by OpenPAM

2002-04-01 Thread Dag-Erling Smorgrav 

Joe Marcus Clarke [EMAIL PROTECTED] writes:
 I think I found why pam_ldap wouldn't work with OpenPAM on -CURRENT. 
 Attached is my proposed patch to OpenPAM.  With this applied, pam_ldap
 works like a champ.

But of course!  Thank you very much, that was a stupid braino.

DES
-- 
Dag-Erling Smorgrav - [EMAIL PROTECTED]

To Unsubscribe: send mail to [EMAIL PROTECTED]
with unsubscribe freebsd-current in the body of the message

Re: Ports broken by OpenPAM

2002-03-31 Thread Joe Marcus Clarke 

On Mon, 2002-03-25 at 10:00, Dag-Erling Smorgrav wrote:
 Joe Clarke [EMAIL PROTECTED] writes:
  Really?  I never received it.  Please send it again.  Thanks.
 
 Here's an updated (but untested) version.
 

I think I found why pam_ldap wouldn't work with OpenPAM on -CURRENT. 
Attached is my proposed patch to OpenPAM.  With this applied, pam_ldap
works like a champ.

Joe

-- 
PGP Key: http://www.marucscom.com/pgp.asc


Index: lib/pam_set_data.c
===
RCS file: /home/ncvs/src/contrib/openpam/lib/pam_set_data.c,v
retrieving revision 1.1.1.4
diff -u -r1.1.1.4 pam_set_data.c
--- lib/pam_set_data.c  14 Mar 2002 20:42:06 -  1.1.1.4
+++ lib/pam_set_data.c  31 Mar 2002 22:43:21 -
@@ -77,8 +77,10 @@
free(data);
return (PAM_BUF_ERR);
}
+   dp-data = data;
+   dp-cleanup = cleanup
dp-next = pamh-module_data;
-   pamh-module_data = data;
+   pamh-module_data = dp;
return (PAM_SUCCESS);
 }
 



signature.asc
Description: This is a digitally signed message part

Re: Ports broken by OpenPAM

2002-03-26 Thread Joe Clarke 



On 25 Mar 2002, Dag-Erling Smorgrav wrote:

 Joe Clarke [EMAIL PROTECTED] writes:
  Really?  I never received it.  Please send it again.  Thanks.

 Here's an updated (but untested) version.

The patch applies cleanly, and pam_ldap builds.  Howvever, every service I
try to authenticate with it fails with a core dump of some kind.  I'm
currently analyzing ftpd which dies on a SIGILL.  As soon as I have a
backtrace, I'll send it out.

Joe


 DES
 --
 Dag-Erling Smorgrav - [EMAIL PROTECTED]




To Unsubscribe: send mail to [EMAIL PROTECTED]
with unsubscribe freebsd-current in the body of the message

Re: Ports broken by OpenPAM

2002-03-25 Thread Dag-Erling Smorgrav 

Kris Kennaway [EMAIL PROTECTED] writes:
 bftpd-1.0.22.log
 pam-pgsql-0.5.2_2.log

Not tested.

 pam_ldap-1.4.0.log

Not my problem; I sent the maintainer a patch ages ago.

 pam_mysql-0.4.7.log

Not tested.

 pam_ssh-1.5.log

This port should die, pam_ssh(8) is in the base system and the port is
way out of date.

 samba-3.0a15.log

See previous mail.

 vlock-1.3.log

Not tested.

DES
-- 
Dag-Erling Smorgrav - [EMAIL PROTECTED]

To Unsubscribe: send mail to [EMAIL PROTECTED]
with unsubscribe freebsd-current in the body of the message

Re: Ports broken by OpenPAM

2002-03-25 Thread Joe Clarke 



On 25 Mar 2002, Dag-Erling Smorgrav wrote:

 Kris Kennaway [EMAIL PROTECTED] writes:
  bftpd-1.0.22.log
  pam-pgsql-0.5.2_2.log

 Not tested.

  pam_ldap-1.4.0.log

 Not my problem; I sent the maintainer a patch ages ago.

Really?  I never received it.  Please send it again.  Thanks.

Joe

[snip]


To Unsubscribe: send mail to [EMAIL PROTECTED]
with unsubscribe freebsd-current in the body of the message

Re: Ports broken by OpenPAM

2002-03-25 Thread Dag-Erling Smorgrav 

Joe Clarke [EMAIL PROTECTED] writes:
 Really?  I never received it.  Please send it again.  Thanks.

Here's an updated (but untested) version.

DES
-- 
Dag-Erling Smorgrav - [EMAIL PROTECTED]



--- pam_ldap.c.orig	Mon Mar 25 15:54:28 2002
+++ pam_ldap.c	Mon Mar 25 15:54:29 2002
@@ -126,12 +126,7 @@
 #include pam_ldap.h
 #include md5.h
 
-#ifdef HAVE_SECURITY_PAM_MISC_H
- /* FIXME: is there something better to check? */
 #define CONST_ARG const
-#else
-#define CONST_ARG
-#endif
 
 #ifndef HAVE_LDAP_MEMFREE
 #define ldap_memfree(x)	free(x)
@@ -2843,11 +2838,11 @@
 		{
 		  _conv_sendmsg (appconv, Password change aborted,
  PAM_ERROR_MSG, no_warn);
-#ifdef PAM_AUTHTOK_RECOVERY_ERR
-		  return PAM_AUTHTOK_RECOVERY_ERR;
-#else
+#ifdef PAM_AUTHTOK_RECOVER_ERR
 		  return PAM_AUTHTOK_RECOVER_ERR;
-#endif /* PAM_AUTHTOK_RECOVERY_ERR */
+#else
+		  return PAM_AUTHTOK_RECOVERY_ERR;
+#endif /* PAM_AUTHTOK_RECOVER_ERR */
 		}
 		  else
 		{
@@ -2887,11 +2882,11 @@
   syslog (LOG_ERR,
 	  pam_ldap: error getting old authentication token (%s),
 	  pam_strerror (pamh, rc));
-#ifdef PAM_AUTHTOK_RECOVERY_ERR
-  return PAM_AUTHTOK_RECOVERY_ERR;
-#else
+#ifdef PAM_AUTHTOK_RECOVER_ERR
   return PAM_AUTHTOK_RECOVER_ERR;
-#endif /* PAM_AUTHTOK_RECOVERY_ERR */
+#else
+  return PAM_AUTHTOK_RECOVERY_ERR;
+#endif /* PAM_AUTHTOK_RECOVER_ERR */
 }
 
   if (try_first_pass || use_first_pass)
@@ -2901,11 +2896,11 @@
 	newpass = NULL;
 
   if (use_first_pass  newpass == NULL)
-#ifdef PAM_AUTHTOK_RECOVERY_ERR
-	return PAM_AUTHTOK_RECOVERY_ERR;
-#else
+#ifdef PAM_AUTHTOK_RECOVER_ERR
 	return PAM_AUTHTOK_RECOVER_ERR;
-#endif /* PAM_AUTHTOK_RECOVERY_ERR */
+#else
+	return PAM_AUTHTOK_RECOVERY_ERR;
+#endif /* PAM_AUTHTOK_RECOVER_ERR */
 }
 
   tries = 0;
@@ -2955,11 +2950,11 @@
 	}
   else
 	{
-#ifdef PAM_AUTHTOK_RECOVERY_ERR
-	  return PAM_AUTHTOK_RECOVERY_ERR;
-#else
+#ifdef PAM_AUTHTOK_RECOVER_ERR
 	  return PAM_AUTHTOK_RECOVER_ERR;
-#endif /* PAM_AUTHTOK_RECOVERY_ERR */
+#else
+	  return PAM_AUTHTOK_RECOVERY_ERR;
+#endif /* PAM_AUTHTOK_RECOVER_ERR */
 	}
 
   if (cmiscptr == NULL)
@@ -2991,11 +2986,11 @@
 		{
 		  _conv_sendmsg (appconv, Password change aborted,
  PAM_ERROR_MSG, no_warn);
-#ifdef PAM_AUTHTOK_RECOVERY_ERR
-		  return PAM_AUTHTOK_RECOVERY_ERR;
-#else
+#ifdef PAM_AUTHTOK_RECOVER_ERR
 		  return PAM_AUTHTOK_RECOVER_ERR;
-#endif /* PAM_AUTHTOK_RECOVERY_ERR */
+#else
+		  return PAM_AUTHTOK_RECOVERY_ERR;
+#endif /* PAM_AUTHTOK_RECOVER_ERR */
 		}
 	}
 	  else if (!strcmp (newpass, miscptr))

Re: Ports broken by OpenPAM

2002-03-25 Thread Joe Marcus Clarke 

On Mon, 2002-03-25 at 10:00, Dag-Erling Smorgrav wrote:
 Joe Clarke [EMAIL PROTECTED] writes:
  Really?  I never received it.  Please send it again.  Thanks.
 
 Here's an updated (but untested) version.

Thanks.  As soon as I finish get my -current machine built, I'll test
these out.  

Joe

 
 DES
 -- 
 Dag-Erling Smorgrav - [EMAIL PROTECTED]
 
 
 

 --- pam_ldap.c.orig   Mon Mar 25 15:54:28 2002
 +++ pam_ldap.cMon Mar 25 15:54:29 2002
 @@ -126,12 +126,7 @@
  #include pam_ldap.h
  #include md5.h
  
 -#ifdef HAVE_SECURITY_PAM_MISC_H
 - /* FIXME: is there something better to check? */
  #define CONST_ARG const
 -#else
 -#define CONST_ARG
 -#endif
  
  #ifndef HAVE_LDAP_MEMFREE
  #define ldap_memfree(x)  free(x)
 @@ -2843,11 +2838,11 @@
   {
 _conv_sendmsg (appconv, Password change aborted,
PAM_ERROR_MSG, no_warn);
 -#ifdef PAM_AUTHTOK_RECOVERY_ERR
 -   return PAM_AUTHTOK_RECOVERY_ERR;
 -#else
 +#ifdef PAM_AUTHTOK_RECOVER_ERR
 return PAM_AUTHTOK_RECOVER_ERR;
 -#endif /* PAM_AUTHTOK_RECOVERY_ERR */
 +#else
 +   return PAM_AUTHTOK_RECOVERY_ERR;
 +#endif /* PAM_AUTHTOK_RECOVER_ERR */
   }
 else
   {
 @@ -2887,11 +2882,11 @@
syslog (LOG_ERR,
 pam_ldap: error getting old authentication token (%s),
 pam_strerror (pamh, rc));
 -#ifdef PAM_AUTHTOK_RECOVERY_ERR
 -  return PAM_AUTHTOK_RECOVERY_ERR;
 -#else
 +#ifdef PAM_AUTHTOK_RECOVER_ERR
return PAM_AUTHTOK_RECOVER_ERR;
 -#endif /* PAM_AUTHTOK_RECOVERY_ERR */
 +#else
 +  return PAM_AUTHTOK_RECOVERY_ERR;
 +#endif /* PAM_AUTHTOK_RECOVER_ERR */
  }
  
if (try_first_pass || use_first_pass)
 @@ -2901,11 +2896,11 @@
   newpass = NULL;
  
if (use_first_pass  newpass == NULL)
 -#ifdef PAM_AUTHTOK_RECOVERY_ERR
 - return PAM_AUTHTOK_RECOVERY_ERR;
 -#else
 +#ifdef PAM_AUTHTOK_RECOVER_ERR
   return PAM_AUTHTOK_RECOVER_ERR;
 -#endif /* PAM_AUTHTOK_RECOVERY_ERR */
 +#else
 + return PAM_AUTHTOK_RECOVERY_ERR;
 +#endif /* PAM_AUTHTOK_RECOVER_ERR */
  }
  
tries = 0;
 @@ -2955,11 +2950,11 @@
   }
else
   {
 -#ifdef PAM_AUTHTOK_RECOVERY_ERR
 -   return PAM_AUTHTOK_RECOVERY_ERR;
 -#else
 +#ifdef PAM_AUTHTOK_RECOVER_ERR
 return PAM_AUTHTOK_RECOVER_ERR;
 -#endif /* PAM_AUTHTOK_RECOVERY_ERR */
 +#else
 +   return PAM_AUTHTOK_RECOVERY_ERR;
 +#endif /* PAM_AUTHTOK_RECOVER_ERR */
   }
  
if (cmiscptr == NULL)
 @@ -2991,11 +2986,11 @@
   {
 _conv_sendmsg (appconv, Password change aborted,
PAM_ERROR_MSG, no_warn);
 -#ifdef PAM_AUTHTOK_RECOVERY_ERR
 -   return PAM_AUTHTOK_RECOVERY_ERR;
 -#else
 +#ifdef PAM_AUTHTOK_RECOVER_ERR
 return PAM_AUTHTOK_RECOVER_ERR;
 -#endif /* PAM_AUTHTOK_RECOVERY_ERR */
 +#else
 +   return PAM_AUTHTOK_RECOVERY_ERR;
 +#endif /* PAM_AUTHTOK_RECOVER_ERR */
   }
   }
 else if (!strcmp (newpass, miscptr))




signature.asc
Description: This is a digitally signed message part

Ports broken by OpenPAM

2002-03-24 Thread Kris Kennaway 

..include the following:

bftpd-1.0.22.log
pam-pgsql-0.5.2_2.log
pam_ldap-1.4.0.log
pam_mysql-0.4.7.log
pam_ssh-1.5.log
samba-3.0a15.log
vlock-1.3.log

Logs available on bento:

http://bento.freebsd.org/errorlogs/5-latest/

Kris



msg36531/pgp0.pgp
Description: PGP signature