Changeset 629 for trunk/server/memcached.c

Timestamp:

10/16/07 01:13:43 (2 years ago)

Author:

plindner

Message:

Patch from David Bremner <bremner@…> that implements a new option "-a"
which takes an octal permission mask (like chmod) sets the permissions
on the unix domain socket (specified by "-s").

Files:

• trunk/server/memcached.c (modified) (7 diffs)

trunk/server/memcached.c

@@ -165 +165 @@
 
 static void settings_init(void) {
+    settings.access=0700;
     settings.port = 11211;
     settings.udpport = 0;
@@ -761 +762 @@
                 memcpy(ITEM_data(new_it) + old_it->nbytes - 2 /* CRLF */, ITEM_data(it), it->nbytes);
             } else {
-                /* NREAD_PREPEND */ 
+                /* NREAD_PREPEND */
                 memcpy(ITEM_data(new_it), ITEM_data(it), it->nbytes);
                 memcpy(ITEM_data(new_it) + it->nbytes - 2 /* CRLF */, ITEM_data(old_it), old_it->nbytes);
@@ -2279 +2280 @@
 }
 
-static int server_socket_unix(const char *path) {
+static int server_socket_unix(const char *path, int access_mask) {
     int sfd;
     struct linger ling = {0, 0};
@@ -2285 +2286 @@
     struct stat tstat;
     int flags =1;
+    int old_umask;
 
     if (!path) {
@@ -2314 +2316 @@
     addr.sun_family = AF_UNIX;
     strcpy(addr.sun_path, path);
+    old_umask=umask( ~(access_mask&0777));
     if (bind(sfd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
         perror("bind()");
         close(sfd);
+        umask(old_umask);
         return -1;
     }
+    umask(old_umask);
     if (listen(sfd, 1024) == -1) {
         perror("listen()");
@@ -2568 +2573 @@
 
     /* process arguments */
-    while ((c = getopt(argc, argv, "bp:s:U:m:Mc:khirvdl:u:P:f:s:n:t:D:")) != -1) {
+    while ((c = getopt(argc, argv, "a:bp:s:U:m:Mc:khirvdl:u:P:f:s:n:t:D:")) != -1) {
         switch (c) {
+        case 'a':
+            /* access for unix domain socket, as octal mask (like chmod)*/
+            settings.access= strtol(optarg,NULL,8);
+            break;
+
         case 'U':
             settings.udpport = atoi(optarg);
@@ -2747 +2757 @@
     /* create unix mode sockets after dropping privileges */
     if (settings.socketpath != NULL) {
-        l_socket = server_socket_unix(settings.socketpath);
+        l_socket = server_socket_unix(settings.socketpath,settings.access);
         if (l_socket == -1) {
             fprintf(stderr, "failed to listen\n");