summaryrefslogtreecommitdiff
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 e7a7c6616..2bcec0445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@
16 Jean-Charles Longuet (jclonguet at free.fr); portable #207 ok markus@ 16 Jean-Charles Longuet (jclonguet at free.fr); portable #207 ok markus@
17 - (djm) Add warning for UsePAM when built without PAM support 17 - (djm) Add warning for UsePAM when built without PAM support
18 - (djm) A few type mismatch fixes from Bug #565 18 - (djm) A few type mismatch fixes from Bug #565
19 - (djm) Guard free_pam_environment against NULL argument. Works around
20 HP/UX PAM problems debugged by dtucker
19 21
2020030515 2220030515
21 - (djm) OpenBSD CVS Sync 23 - (djm) OpenBSD CVS Sync
@@ -1547,4 +1549,4 @@
1547 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1549 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1548 ok provos@ 1550 ok provos@
1549 1551
1550$Id: ChangeLog,v 1.2729 2003/05/16 05:51:44 djm Exp $ 1552$Id: ChangeLog,v 1.2730 2003/05/16 08:21:01 djm Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 34326c242..dc4116175 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -648,6 +648,9 @@ free_pam_environment(char **env)
648{ 648{
649 char **envp; 649 char **envp;
650 650
651 if (env == NULL)
652 return;
653
651 for (envp = env; *envp; envp++) 654 for (envp = env; *envp; envp++)
652 xfree(*envp); 655 xfree(*envp);
653 xfree(env); 656 xfree(env);