From: Frank Lahm <franklahm@googlemail.com>
Date: Mon, 6 Feb 2012 14:57:21 +0000 (+0100)
Subject: Ensure our umask is not altered by eg pam_umask
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=b6e5771627bb9bd18ac70c9a5f8b79e5e5562e79

Ensure our umask is not altered by eg pam_umask
---

diff --git a/NEWS b/NEWS
index 7a9153bb..2ad321a0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,9 @@
-Changes in ?.?.?
+Changes in 2.2.3
 ================
 
 * UPD: based on Unicode 6.1.0
 * UPD: experimental systemd service files: always run both afpd and cnid_metad
+* UPD: afpd: Ensure our umask is not altered by eg pam_umask
 
 Changes in 2.2.2
 ================
diff --git a/VERSION b/VERSION
index 7e541aec..00e2c4e8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.2
\ No newline at end of file
+2.2.3dev
\ No newline at end of file
diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c
index 5220493e..40d3a5ac 100644
--- a/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@ -412,6 +412,9 @@ static int login(AFPObj *obj, struct passwd *pwd, void (*logout)(void), int expi
     save_uidgid ( &obj->uidgid );
 #endif
 
+    /* pam_umask or similar might have changed our umask */
+    (void)umask(obj->options.umask);
+
     return( AFP_OK );
 }