File syslog-ng-no-perm-change.dif of Package syslog-ng

Overview Repositories Revisions Requests Users Attributes Meta

File syslog-ng-no-perm-change.dif of Package syslog-ng (Revision 3e0b00a14418d13acbc6a69eb2f34b54)

Currently displaying revision 3e0b00a14418d13acbc6a69eb2f34b54 , Show latest

--- src/affile.c
+++ src/affile.c	2007/07/30 10:02:27
@@ -86,20 +86,27 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+/*
+ * Flags used to remember which option was explicitly set
+ * to the default value (-1) to avoid any permission and
+ * ownership changes on already existing (device) files.
+ * In case the file does not exists, global options apply.
+ * Note: The pipe driver never creates any (device) file.
+ */
+#define OPT_NO_CHMOD        0x0001
+#define OPT_NO_CHOWN        0x0002
+#define OPT_NO_CHGRP        0x0004
 
 static int do_open_file(struct ol_string *name, int flags, 
                         int uid, int gid, int mode, 
                         int dir_uid, int dir_gid, int dir_mode,
-                        int create_dirs, int *fd)
+                        int create_dirs, int *fd, int nochopts)
 {
 	if (strstr((char *) name->data, "../") ||
 	    strstr((char *) name->data, "/..")) {
 		werror("Spurious path %S, logfile not created\n", name);
 		return 0;
 	}
-	if (strncmp((char *) name->data, "/dev", 4) == 0 && (uid != -1 || gid != -1 || mode != -1)) {
-		werror("Changing permissions on special file %S\n", name);
-	}
 
 	*fd = open((char *) name->data, flags, mode != -1 ? mode : 0600);
 	if (create_dirs && *fd == -1 && errno == ENOENT) {
@@ -125,14 +132,31 @@
 			*p = '/';
 			p = strchr(p + 1, '/');
 		}
-		*fd = open((char *) name->data, flags, mode);
+		*fd = open((char *) name->data, flags, mode != -1 ? mode : 0600);
+		if (fd != -1) {
+			if (strncmp((char *) name->data, "/dev", 4) == 0 &&
+			   (uid != -1  || gid != -1 || mode != -1)) {
+				werror("Changing permissions on special file %S\n", name);
+			}
+			if (uid != -1 || gid != -1)
+				chown((char *) name->data, uid, gid);
+			if (mode != -1)
+				chmod((char *) name->data, mode);
+		}
+	} else {
+		if (strncmp((char *) name->data, "/dev", 4) == 0 &&
+		   ((uid != -1  && !(nochopts & OPT_NO_CHOWN)) ||
+		    (gid != -1  && !(nochopts & OPT_NO_CHGRP)) ||
+		    (mode != -1 && !(nochopts & OPT_NO_CHMOD)))) {
+			werror("Changing permissions on special file %S\n", name);
+		}
+		if (uid != -1 && !(nochopts & OPT_NO_CHOWN))
+			chown((char *) name->data, uid, -1);
+		if (gid != -1 && !(nochopts & OPT_NO_CHGRP))
+			chown((char *) name->data, -1, gid);
+		if (mode != -1 && !(nochopts & OPT_NO_CHMOD))
+			chmod((char *) name->data, mode);
 	}
-	if (uid != -1)
-		chown((char *) name->data, uid, -1);
-	if (gid != -1)
-		chown((char *) name->data, -1, gid);
-	if (mode != -1)
-		chmod((char *) name->data, mode);
 	return *fd != -1;
 }
 
@@ -158,7 +182,7 @@
   		flags = O_RDWR | O_NOCTTY | O_NONBLOCK | O_LARGEFILE;
   	else
 	  	flags = O_RDONLY | O_NOCTTY | O_NONBLOCK | O_LARGEFILE;
-	if (do_open_file(self->name, flags, -1, -1, -1, -1, -1, -1, 0, &fd)) {
+	if (do_open_file(self->name, flags, -1, -1, -1, -1, -1, -1, 0, &fd, 0)) {
 		io_set_nonblocking(fd);
 		lseek(fd, 0, SEEK_END);
 		self->src = io_read(make_io_fd(cfg->backend, fd, ol_string_use(self->name)), 
@@ -284,7 +308,9 @@
 	if (do_open_file(self->expanded_fname, flags, 
 	                 self->owner->uid, self->owner->gid, self->owner->perm, 
 	                 self->owner->dir_uid, self->owner->dir_gid, self->owner->dir_perm,
-	                 self->owner->flags & AFFILE_CREATE_DIRS, &fd)) {
+	                 (self->owner->flags & AFFILE_PIPE ? 0 :
+			  self->owner->flags & AFFILE_CREATE_DIRS),
+			 &fd, self->owner->opt)) {
 
 		self->dest = 
 			io_write(make_io_fd(cfg->backend, fd, ol_string_use(self->expanded_fname)), 
@@ -352,6 +378,7 @@
        (name affile_dest)
        (super log_dest_driver)
        (vars
+         (opt . int)
          (uid . int)
 	 (gid . int)
 	 (perm . int)
@@ -408,6 +435,8 @@
 		self->uid = pwd->pw_uid;
 	else
 		self->uid = atoi(owner);
+	if(self->uid == -1)
+		self->opt |= OPT_NO_CHOWN;
 }
 
 void affile_set_group(struct log_dest_driver *c, char *group)
@@ -420,6 +449,8 @@
 		self->gid = grp->gr_gid;
 	else
 		self->gid = atoi(group);
+	if(self->gid == -1)
+		self->opt |= OPT_NO_CHGRP;
 }
 
 void affile_set_perm(struct log_dest_driver *c, int perm)
@@ -427,6 +458,8 @@
 	CAST(affile_dest, self, c);
 
 	self->perm = perm;
+	if(self->perm == -1)
+		self->opt |= OPT_NO_CHMOD;
 }
 
 void affile_set_dir_owner(struct log_dest_driver *c, char *owner)
@@ -600,6 +633,7 @@
 	self->super.super.init = do_init_affile_dest;
 	self->super.super.handler = do_handle_affile_log;
 	self->super.log_fifo_size = -1;
+	self->opt = 0;
 	self->uid = self->gid = -1;
 	self->perm = -1;
 	self->dir_uid = self->dir_gid = -1;
--- src/affile.c.x
+++ src/affile.c.x	2007/07/30 10:01:29
@@ -105,6 +105,7 @@
 struct affile_dest
 {
   struct log_dest_driver super;
+  int opt;
   int uid;
   int gid;
   int perm;

Places

File syslog-ng-no-perm-change.dif of Package syslog-ng (Revision 3e0b00a14418d13acbc6a69eb2f34b54)

Places