summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-05-16 18:21:01 +1000
committerDamien Miller <djm@mindrot.org>2003-05-16 18:21:01 +1000
commite27c6cc3adceec08bb72d4c872a04598e9ae6b41 (patch)
tree7af079ff047c99b79e550712d1bbea0ee82a8901
parentc46b6bc4f7341198707355c8aff1d6702830f77e (diff)
- (djm) Guard free_pam_environment against NULL argument. Works around
HP/UX PAM problems debugged by dtucker
-rw-r--r--ChangeLog4
-rw-r--r--auth-pam.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e7a7c661..2bcec044 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@
Jean-Charles Longuet (jclonguet at free.fr); portable #207 ok markus@
- (djm) Add warning for UsePAM when built without PAM support
- (djm) A few type mismatch fixes from Bug #565
+ - (djm) Guard free_pam_environment against NULL argument. Works around
+ HP/UX PAM problems debugged by dtucker
20030515
- (djm) OpenBSD CVS Sync
@@ -1547,4 +1549,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2729 2003/05/16 05:51:44 djm Exp $
+$Id: ChangeLog,v 1.2730 2003/05/16 08:21:01 djm Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 34326c24..dc411617 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -648,6 +648,9 @@ free_pam_environment(char **env)
{
char **envp;
+ if (env == NULL)
+ return;
+
for (envp = env; *envp; envp++)
xfree(*envp);
xfree(env);