Changeset 862 for trunk/server/source3/web

Timestamp:

May 13, 2014, 11:39:04 AM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/web/cgi.c (modified) (3 diffs)
• source3/web/swat.c (modified) (3 diffs)
• source3/web/swat_proto.h (modified) (1 diff)

trunk/server/source3/web/cgi.c

@@ -49 +49 @@
 static char *C_user;
 static char *C_pass;
+
 static bool inetd_server;
 static bool got_request;
@@ -331 +332 @@
 
         if (!setuid(0)) {
-                C_pass = secrets_fetch_generic("root", "SWAT");
-                if (C_pass == NULL) {
-                        char *tmp_pass = NULL;
-                        tmp_pass = generate_random_password(talloc_tos(),
-                                                            16, 16);
-                        if (tmp_pass == NULL) {
-                                printf("%sFailed to create random nonce for "
-                                       "SWAT session\n<br>%s\n", head, tail);
-                                exit(0);
-                        }
-                        secrets_store_generic("root", "SWAT", tmp_pass);
-                        C_pass = SMB_STRDUP(tmp_pass);
-                        TALLOC_FREE(tmp_pass);
-                }
+                C_pass = SMB_STRDUP(cgi_nonce());
         }
         setuid(pwd->pw_uid);
@@ -459 +447 @@
 {
         return(C_pass);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

trunk/server/source3/web/swat.c

@@ -155 +155 @@
         uint8_t token[16];
         int i;
+
 
         token_str[0] = '\0';
@@ -168 +169 @@
                 MD5Update(&md5_ctx, (uint8_t *)pass, strlen(pass));
         }
+
 
         MD5Final(token, &md5_ctx);
@@ -267 +269 @@
                 printf("Expires: 0\r\n");
         }
-        printf("Content-type: text/html\r\n\r\n");
+        printf("Content-type: text/html\r\n");
+        printf("X-Frame-Options: DENY\r\n\r\n");
 
         if (!include_html("include/header.html")) {

trunk/server/source3/web/swat_proto.h

@@ -33 +33 @@
 char *cgi_user_name(void);
 char *cgi_user_pass(void);
+
 void cgi_setup(const char *rootdir, int auth_required);
 const char *cgi_baseurl(void);