From: Arvin Schnell <aschnell@suse.de>
Date: Tue, 24 Nov 2020 11:04:02 +0000 (+0100)
Subject: - do not override passwd after getpwuid_r et.al. calls
X-Git-Tag: v0.8.15~13^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F601%2Fhead;p=thirdparty%2Fsnapper.git

- do not override passwd after getpwuid_r et.al. calls
---

diff --git a/package/snapper.changes b/package/snapper.changes
index e31c2b2f..c3c7a823 100644
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 24 11:58:44 CET 2020 - aschnell@suse.com
+
+- do not override passwd after getpwuid_r et.al. calls
+  (gh#openSUSE/snapper#589)
+
 -------------------------------------------------------------------
 Thu Nov 19 11:49:29 CET 2020 - aschnell@suse.com
 
diff --git a/pam/pam_snapper.c b/pam/pam_snapper.c
index 9c581fe9..7ff55f63 100644
--- a/pam/pam_snapper.c
+++ b/pam/pam_snapper.c
@@ -528,8 +528,6 @@ static int get_ugid( pam_handle_t * pamh, const char *pam_user, uid_t * uid, gid
 		return -1;
 	}
 
-	memset( pwd.pw_passwd, 0, strlen( pwd.pw_passwd ) );
-
 	*uid = pwd.pw_uid;
 	*gid = pwd.pw_gid;
 
diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
index 54a44034..1de88ac8 100644
--- a/snapper/AppUtil.cc
+++ b/snapper/AppUtil.cc
@@ -315,8 +315,6 @@ namespace snapper
 	if (e != 0 || result == NULL)
 	    return false;
 
-	memset(pwd.pw_passwd, 0, strlen(pwd.pw_passwd));
-
 	username = pwd.pw_name;
 	gid = pwd.pw_gid;
 
@@ -339,8 +337,6 @@ namespace snapper
 	if (e != 0 || result == NULL)
 	    return false;
 
-	memset(pwd.pw_passwd, 0, strlen(pwd.pw_passwd));
-
 	dir = pwd.pw_dir;
 
 	return true;
@@ -365,8 +361,6 @@ namespace snapper
 	    return false;
 	}
 
-	memset(pwd.pw_passwd, 0, strlen(pwd.pw_passwd));
-
 	uid = pwd.pw_uid;
 
 	return true;
@@ -391,8 +385,6 @@ namespace snapper
 	    return false;
 	}
 
-	memset(grp.gr_passwd, 0, strlen(grp.gr_passwd));
-
 	gid = grp.gr_gid;
 
 	return true;