Ensure our umask is not altered by eg pam_umask

diff --git a/NEWS b/NEWS
index 7a9153bbaa628b807724664291ea9025adbac769..2ad321a05a207e58fa40adec2765f5364ab1915d 100644 (file)
--- 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: 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
 ================
 
 Changes in 2.2.2
 ================

diff --git a/VERSION b/VERSION
index 7e541aec69b34fe38bdf6f049e78b9a67003307f..00e2c4e8a5f2f766f43c61e17861fb6ba4bd05fd 100644 (file)
--- 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 5220493e09d00632285a63a9fba1c413148ee76f..40d3a5ac906b7e56a1de886dedd3f52a70f68546 100644 (file)
--- 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
 
     save_uidgid ( &obj->uidgid );
 #endif
 

+    /* pam_umask or similar might have changed our umask */
+    (void)umask(obj->options.umask);
+

     return( AFP_OK );
 }
 
     return( AFP_OK );
 }