- outdated

Changed files:
    samba-dnssd.patch -> 1.2
    samba-force-group.patch -> 1.2

diff --git a/samba-dnssd.patch b/samba-dnssd.patch
deleted file mode 100644 (file)
index b13d1ce..0000000
--- a/samba-dnssd.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Volker Lendecke <vl@samba.org>
-Date: Tue, 10 Mar 2009 15:08:38 +0000 (+0100)
-Subject: Revert "Revert "Fix a valgrind error / segfault in dns_register_smbd()""
-X-Git-Url: http://gitweb.samba.org/?p=samba.git;a=commitdiff_plain;h=8cb0d6280ecc62d03ea6fb5e522f57a80d9e0262
-
-Revert "Revert "Fix a valgrind error / segfault in dns_register_smbd()""
-
-This reverts commit 96c57d26ed790b3e94c935cc4faf5661ea43a80c.
-
-It is REALLY, REALLY confusing that the 3_X_test build in the build farm
-is 3.2 and NOT 3.3!
----
-
-diff --git a/source/smbd/dnsregister.c b/source/smbd/dnsregister.c
-index 6850d1a..ff9be43 100644
---- a/source/smbd/dnsregister.c
-+++ b/source/smbd/dnsregister.c
-@@ -108,7 +108,8 @@ void dns_register_smbd(struct dns_reg_state ** dns_state_ptr,
-       struct dns_reg_state *dns_state = *dns_state_ptr;
- 
-       if (dns_state == NULL) {
--              *dns_state_ptr = dns_state = talloc(NULL, struct dns_reg_state);
-+              dns_state = talloc_zero(NULL, struct dns_reg_state);
-+              *dns_state_ptr = dns_state;
-               if (dns_state == NULL) {
-                       return;
-               }

diff --git a/samba-force-group.patch b/samba-force-group.patch
deleted file mode 100644 (file)
index 2003b7a..0000000
--- a/samba-force-group.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/source/include/smb.h b/source/include/smb.h
-index a98d151..56d9461 100644
---- a/source/include/smb.h
-+++ b/source/include/smb.h
-@@ -597,6 +597,12 @@ typedef struct connection_struct {
-        */
-       struct auth_serversupplied_info *server_info;
- 
-+      /*
-+       * If the "force group" parameter is set, this is the primary gid that
-+       * may be used in the users token, depending on the vuid using this tid.
-+       */
-+      gid_t force_group_gid;
-+
-       char client_address[INET6_ADDRSTRLEN]; /* String version of client IP address. */
- 
-       uint16 vuid; /* vuid of user who *opened* this connection, or UID_FIELD_INVALID */
-diff --git a/source/smbd/conn.c b/source/smbd/conn.c
-index 7f34d2b..a6eafcf 100644
---- a/source/smbd/conn.c
-+++ b/source/smbd/conn.c
-@@ -145,6 +145,7 @@ find_again:
-               return NULL;
-       }
-       conn->cnum = i;
-+      conn->force_group_gid = (gid_t)-1;
- 
-       bitmap_set(bmap, i);
- 
-diff --git a/source/smbd/service.c b/source/smbd/service.c
-index c39584a..5e75fce 100644
---- a/source/smbd/service.c
-+++ b/source/smbd/service.c
-@@ -834,6 +834,14 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
-                       *pstatus = status;
-                       return NULL;
-               }
-+
-+              /*
-+               * We need to cache this gid, to use within
-+               * change_to_user() separately from the conn->server_info
-+               * struct. We only use conn->server_info directly if
-+               * "force_user" was set.
-+               */
-+              conn->force_group_gid = conn->server_info->utok.gid;
-       }
- 
-       conn->vuid = (vuser != NULL) ? vuser->vuid : UID_FIELD_INVALID;
-diff --git a/source/smbd/uid.c b/source/smbd/uid.c
-index 119a155..02f8cc9 100644
---- a/source/smbd/uid.c
-+++ b/source/smbd/uid.c
-@@ -256,6 +256,8 @@ bool change_to_user(connection_struct *conn, uint16 vuid)
- 
-       if((group_c = *lp_force_group(snum))) {
- 
-+              SMB_ASSERT(conn->force_group_gid != (gid_t)-1);
-+
-               if(group_c == '+') {
- 
-                       /*
-@@ -268,15 +270,18 @@ bool change_to_user(connection_struct *conn, uint16 vuid)
-                       int i;
-                       for (i = 0; i < num_groups; i++) {
-                               if (group_list[i]
--                                  == conn->server_info->utok.gid) {
--                                      gid = conn->server_info->utok.gid;
-+                                  == conn->force_group_gid) {
-+                                      conn->server_info->utok.gid =
-+                                              conn->force_group_gid;
-+                                      gid = conn->force_group_gid;
-                                       gid_to_sid(&conn->server_info->ptok
-                                                  ->user_sids[1], gid);
-                                       break;
-                               }
-                       }
-               } else {
--                      gid = conn->server_info->utok.gid;
-+                      conn->server_info->utok.gid = conn->force_group_gid;
-+                      gid = conn->force_group_gid;
-                       gid_to_sid(&conn->server_info->ptok->user_sids[1],
-                                  gid);
-               }