Changeset 309 for branches/samba-3.3.x/source/lib

Timestamp:

Aug 4, 2009, 8:51:22 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 to 3.3.7

Location:

branches/samba-3.3.x/source/lib

Files:

• netapi/joindomain.c (modified) (1 diff)
• netapi/user.c (modified) (1 diff)
• system.c (modified) (2 diffs)
• util.c (modified) (1 diff)

branches/samba-3.3.x/source/lib/netapi/joindomain.c

@@ -208 +208 @@
         u->in.domain_name = domain;
         u->in.unjoin_flags = r->in.unjoin_flags;
+        u->in.delete_machine_account = false;
         u->in.modify_config = true;
         u->in.debug = true;

branches/samba-3.3.x/source/lib/netapi/user.c

@@ -1772 +1772 @@
         switch (r->in.level) {
                 case 0:
+                        user_mask = SAMR_USER_ACCESS_SET_ATTRIBUTES;
+                        break;
                 case 1003:
                         user_mask = SAMR_USER_ACCESS_SET_PASSWORD;

branches/samba-3.3.x/source/lib/system.c

@@ -117 +117 @@
 A read wrapper that will deal with EINTR.
 ********************************************************************/
+
 ssize_t sys_read(int fd, void *buf, size_t count)
 {
         ssize_t ret;
+
         do {
                 ret = read(fd, buf, count);
@@ -129 +131 @@
 A write wrapper that will deal with EINTR.
 ********************************************************************/
+
 ssize_t sys_write(int fd, const void *buf, size_t count)
 {
         ssize_t ret;
+
         do {
                 ret = write(fd, buf, count);

branches/samba-3.3.x/source/lib/util.c

@@ -2723 +2723 @@
                 }
                 if (name) {
-                        *name = "";
+                        *name = dir;
                 }
                 return True;