Changeset 282 for branches/samba-3.2.x/source
- Timestamp:
- Jun 24, 2009, 10:34:52 AM (16 years ago)
- Location:
- branches/samba-3.2.x/source
- Files:
-
- 4 edited
-
VERSION (modified) (1 diff)
-
client/client.c (modified) (18 diffs)
-
include/version.h (modified) (1 diff)
-
smbd/posix_acls.c (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/samba-3.2.x/source/VERSION
r272 r282 26 26 SAMBA_VERSION_MAJOR=3 27 27 SAMBA_VERSION_MINOR=2 28 SAMBA_VERSION_RELEASE=1 228 SAMBA_VERSION_RELEASE=13 29 29 30 30 ######################################################## -
branches/samba-3.2.x/source/client/client.c
r232 r282 365 365 /* Ensure cur_dir ends in a DIRSEP */ 366 366 if ((new_cd[0] != '\0') && (*(new_cd+strlen(new_cd)-1) != CLI_DIRSEP_CHAR)) { 367 new_cd = talloc_asprintf_append(new_cd, CLI_DIRSEP_STR);367 new_cd = talloc_asprintf_append(new_cd, "%s", CLI_DIRSEP_STR); 368 368 if (!new_cd) { 369 369 goto out; … … 872 872 mask = talloc_strdup(ctx, buf); 873 873 } else { 874 mask = talloc_asprintf_append(mask, buf);874 mask = talloc_asprintf_append(mask, "%s", buf); 875 875 } 876 876 } else { … … 913 913 } 914 914 if ((mask[0] != '\0') && (mask[strlen(mask)-1]!=CLI_DIRSEP_CHAR)) { 915 mask = talloc_asprintf_append(mask, CLI_DIRSEP_STR);915 mask = talloc_asprintf_append(mask, "%s", CLI_DIRSEP_STR); 916 916 if (!mask) { 917 917 return 1; … … 924 924 mask = talloc_strdup(ctx, buf); 925 925 } else { 926 mask = talloc_asprintf_append(mask, buf);926 mask = talloc_asprintf_append(mask, "%s", buf); 927 927 } 928 928 } else { … … 1108 1108 return 1; 1109 1109 } 1110 rname = talloc_asprintf_append(rname, fname);1110 rname = talloc_asprintf_append(rname, "%s", fname); 1111 1111 if (!rname) { 1112 1112 return 1; … … 1267 1267 return 1; 1268 1268 } 1269 rname = talloc_asprintf_append(rname, fname);1269 rname = talloc_asprintf_append(rname, "%s", fname); 1270 1270 if (!rname) { 1271 1271 return 1; … … 1319 1319 } else { 1320 1320 mget_mask = talloc_asprintf_append(mget_mask, 1321 buf);1321 "%s", buf); 1322 1322 } 1323 1323 if (!mget_mask) { … … 1420 1420 return 1; 1421 1421 } 1422 mask = talloc_asprintf_append(mask, buf);1422 mask = talloc_asprintf_append(mask, "%s", buf); 1423 1423 if (!mask) { 1424 1424 return 1; … … 1449 1449 p = strtok_r(ddir, "/\\", &saveptr); 1450 1450 while (p) { 1451 ddir2 = talloc_asprintf_append(ddir2, p);1451 ddir2 = talloc_asprintf_append(ddir2, "%s", p); 1452 1452 if (!ddir2) { 1453 1453 return 1; … … 1456 1456 do_mkdir(ddir2); 1457 1457 } 1458 ddir2 = talloc_asprintf_append(ddir2, CLI_DIRSEP_STR);1458 ddir2 = talloc_asprintf_append(ddir2, "%s", CLI_DIRSEP_STR); 1459 1459 if (!ddir2) { 1460 1460 return 1; … … 1488 1488 return 1; 1489 1489 } 1490 name = talloc_asprintf_append(name, buf);1490 name = talloc_asprintf_append(name, "%s", buf); 1491 1491 if (!name) { 1492 1492 return 1; … … 1572 1572 return 1; 1573 1573 } 1574 name = talloc_asprintf_append(name, buf);1574 name = talloc_asprintf_append(name, "%s", buf); 1575 1575 if (!name) { 1576 1576 return 1; … … 1739 1739 1740 1740 if (next_token_talloc(ctx, &cmd_ptr,&buf,NULL)) { 1741 rname = talloc_asprintf_append(rname, buf);1741 rname = talloc_asprintf_append(rname, "%s", buf); 1742 1742 } else { 1743 rname = talloc_asprintf_append(rname, lname);1743 rname = talloc_asprintf_append(rname, "%s", lname); 1744 1744 } 1745 1745 if (!rname) { … … 2138 2138 return 1; 2139 2139 } 2140 mask = talloc_asprintf_append(mask, buf);2140 mask = talloc_asprintf_append(mask, "%s", buf); 2141 2141 if (!mask) { 2142 2142 return 1; … … 3530 3530 return 1; 3531 3531 } 3532 remote_name = talloc_asprintf_append(remote_name, fname);3532 remote_name = talloc_asprintf_append(remote_name, "%s", fname); 3533 3533 if (!remote_name) { 3534 3534 return 1; … … 3577 3577 if (next_token_talloc(ctx, &cmd_ptr, &buf, NULL)) { 3578 3578 remote_name = talloc_asprintf_append(remote_name, 3579 buf);3579 "%s", buf); 3580 3580 } else { 3581 3581 remote_name = talloc_asprintf_append(remote_name, 3582 local_name);3582 "%s", local_name); 3583 3583 } 3584 3584 if (!remote_name) { … … 4113 4113 return; 4114 4114 } 4115 tmp = talloc_asprintf_append(tmp, f->name);4115 tmp = talloc_asprintf_append(tmp, "%s", f->name); 4116 4116 if (!tmp) { 4117 4117 TALLOC_FREE(ctx); … … 4119 4119 } 4120 4120 if (f->mode & aDIR) { 4121 tmp = talloc_asprintf_append(tmp, CLI_DIRSEP_STR);4121 tmp = talloc_asprintf_append(tmp, "%s", CLI_DIRSEP_STR); 4122 4122 } 4123 4123 if (!tmp) { -
branches/samba-3.2.x/source/include/version.h
r272 r282 2 2 #define SAMBA_VERSION_MAJOR 3 3 3 #define SAMBA_VERSION_MINOR 2 4 #define SAMBA_VERSION_RELEASE 1 25 #define SAMBA_VERSION_OFFICIAL_STRING "3.2.1 2"4 #define SAMBA_VERSION_RELEASE 13 5 #define SAMBA_VERSION_OFFICIAL_STRING "3.2.13" 6 6 #define SAMBA_VERSION_STRING samba_version_string() -
branches/samba-3.2.x/source/smbd/posix_acls.c
r272 r282 2385 2385 2386 2386 static bool acl_group_override(connection_struct *conn, 2387 gid_t prim_gid,2387 SMB_STRUCT_STAT *psbuf, 2388 2388 const char *fname) 2389 2389 { 2390 SMB_STRUCT_STAT sbuf;2391 2392 2390 if ((errno != EPERM) && (errno != EACCES)) { 2393 2391 return false; … … 2396 2394 /* file primary group == user primary or supplementary group */ 2397 2395 if (lp_acl_group_control(SNUM(conn)) && 2398 current_user_in_group(p rim_gid)) {2396 current_user_in_group(psbuf->st_gid)) { 2399 2397 return true; 2400 2398 } … … 2402 2400 /* user has writeable permission */ 2403 2401 if (lp_dos_filemode(SNUM(conn)) && 2404 can_write_to_file(conn, fname, &sbuf)) {2402 can_write_to_file(conn, fname, psbuf)) { 2405 2403 return true; 2406 2404 } … … 2413 2411 ****************************************************************************/ 2414 2412 2415 static bool set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, bool default_ace, gid_t prim_gid, bool *pacl_set_support)2413 static bool set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, bool default_ace, SMB_STRUCT_STAT *psbuf, bool *pacl_set_support) 2416 2414 { 2417 2415 connection_struct *conn = fsp->conn; … … 2592 2590 } 2593 2591 2594 if (acl_group_override(conn, p rim_gid, fsp->fsp_name)) {2592 if (acl_group_override(conn, psbuf, fsp->fsp_name)) { 2595 2593 int sret; 2596 2594 … … 2623 2621 } 2624 2622 2625 if (acl_group_override(conn, p rim_gid, fsp->fsp_name)) {2623 if (acl_group_override(conn, psbuf, fsp->fsp_name)) { 2626 2624 int sret; 2627 2625 … … 3628 3626 become_root(); 3629 3627 } 3630 ret = set_canon_ace_list(fsp, file_ace_list, False, sbuf.st_gid, &acl_set_support);3628 ret = set_canon_ace_list(fsp, file_ace_list, False, &sbuf, &acl_set_support); 3631 3629 if (set_acl_as_root) { 3632 3630 unbecome_root(); … … 3645 3643 become_root(); 3646 3644 } 3647 ret = set_canon_ace_list(fsp, dir_ace_list, True, sbuf.st_gid, &acl_set_support);3645 ret = set_canon_ace_list(fsp, dir_ace_list, True, &sbuf, &acl_set_support); 3648 3646 if (set_acl_as_root) { 3649 3647 unbecome_root(); … … 3670 3668 } 3671 3669 if (sret == -1) { 3672 if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {3670 if (acl_group_override(conn, &sbuf, fsp->fsp_name)) { 3673 3671 DEBUG(5,("set_nt_acl: acl group control on and " 3674 3672 "current user in file %s primary group. Override delete_def_acl\n", … … 3730 3728 } 3731 3729 if(sret == -1) { 3732 if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {3730 if (acl_group_override(conn, &sbuf, fsp->fsp_name)) { 3733 3731 DEBUG(5,("set_nt_acl: acl group control on and " 3734 3732 "current user in file %s primary group. Override chmod\n",
Note:
See TracChangeset
for help on using the changeset viewer.
