Changeset 739 for branches/samba-3.5.x/source3
- Timestamp:
- Nov 12, 2012, 7:37:04 PM (13 years ago)
- Location:
- branches/samba-3.5.x/source3
- Files:
-
- 11 edited
-
Makefile.in (modified) (1 diff)
-
VERSION (modified) (1 diff)
-
configure (modified) (3 diffs)
-
configure.in (modified) (2 diffs)
-
lib/sysquotas.c (modified) (1 diff)
-
libaddns/dnsmarshall.c (modified) (9 diffs)
-
libsmb/cliconnect.c (modified) (1 diff)
-
libsmb/clispnego.c (modified) (2 diffs)
-
smbd/posix_acls.c (modified) (13 diffs)
-
smbd/server.c (modified) (6 diffs)
-
winbindd/winbindd_cm.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/samba-3.5.x/source3/Makefile.in
r732 r739 2548 2548 @echo "Linking $@" 2549 2549 @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \ 2550 @SONAMEFLAG@`basename $@`2550 $(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@` 2551 2551 2552 2552 bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBWBCLIENT) -
branches/samba-3.5.x/source3/VERSION
r738 r739 26 26 SAMBA_VERSION_MAJOR=3 27 27 SAMBA_VERSION_MINOR=5 28 SAMBA_VERSION_RELEASE=1 828 SAMBA_VERSION_RELEASE=19 29 29 30 30 ######################################################## -
branches/samba-3.5.x/source3/configure
r738 r739 1783 1783 --with-acl-support Include ACL support (default=auto) 1784 1784 --with-aio-support Include asynchronous io support (default=no) 1785 --with-sendfile-support Check for sendfile support (default=yes) 1785 --with-sendfile-support Whether sendfile support should be built in 1786 (default=auto) 1786 1787 --with-wbclient Use external wbclient (optional) 1787 1788 --with-winbind Build winbind (default, if supported by OS) … … 33568 33569 # check for sendfile support 33569 33570 33570 with_sendfile_support=yes 33571 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to check to support sendfile" >&5 33572 $as_echo_n "checking whether to check to support sendfile... " >&6; } 33571 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sendfile support should be built in" >&5 33572 $as_echo_n "checking whether sendfile support should be built in... " >&6; } 33573 33573 33574 33574 # Check whether --with-sendfile-support was given. 33575 33575 if test "${with_sendfile_support+set}" = set; then : 33576 33576 withval=$with_sendfile_support; case "$withval" in 33577 yes) 33578 33577 yes|no) 33578 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 33579 $as_echo "$withval" >&6; }; 33580 with_sendfile_support=$withval 33581 ;; 33582 *) 33579 33583 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 33580 $as_echo "yes" >&6; }; 33581 33582 case "$host_os" in 33584 $as_echo "yes" >&6; } 33585 with_sendfile_support=auto 33586 ;; 33587 esac 33588 fi 33589 33590 33591 if test x$with_sendfile_support != xno ; then 33592 case "$host_os" in 33583 33593 *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) 33584 33594 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linux sendfile64 support" >&5 … … 34126 34136 *) 34127 34137 ;; 34128 esac 34129 ;; 34130 *) 34131 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 34132 $as_echo "no" >&6; } 34133 ;; 34134 esac 34135 else 34136 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 34137 $as_echo "yes" >&6; } 34138 34139 fi 34140 34138 esac 34139 fi 34140 34141 if test x$with_sendfile_support = xyes -a x"$samba_cv_HAVE_SENDFILE" != xyes ; then 34142 as_fn_error $? "sendfile support requested but sendfile not available " "$LINENO" 5 34143 fi 34141 34144 34142 34145 ############################################ -
branches/samba-3.5.x/source3/configure.in
r620 r739 5715 5715 # check for sendfile support 5716 5716 5717 with_sendfile_support=yes 5718 AC_MSG_CHECKING(whether to check to support sendfile) 5717 AC_MSG_CHECKING(whether sendfile support should be built in) 5719 5718 AC_ARG_WITH(sendfile-support, 5720 [AS_HELP_STRING([--with-sendfile-support], [ Check for sendfile support (default=yes)])],5719 [AS_HELP_STRING([--with-sendfile-support], [Whether sendfile support should be built in (default=auto)])], 5721 5720 [ case "$withval" in 5722 yes) 5723 5724 AC_MSG_RESULT(yes); 5725 5726 case "$host_os" in 5721 yes|no) 5722 AC_MSG_RESULT($withval); 5723 with_sendfile_support=$withval 5724 ;; 5725 *) 5726 AC_MSG_RESULT(yes) 5727 with_sendfile_support=auto 5728 ;; 5729 esac ], 5730 ) 5731 5732 if test x$with_sendfile_support != xno ; then 5733 case "$host_os" in 5727 5734 *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) 5728 5735 AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[ … … 5960 5967 *) 5961 5968 ;; 5962 esac 5963 ;; 5964 *) 5965 AC_MSG_RESULT(no) 5966 ;; 5967 esac ], 5968 AC_MSG_RESULT(yes) 5969 ) 5969 esac 5970 fi 5971 5972 if test x$with_sendfile_support = xyes -a x"$samba_cv_HAVE_SENDFILE" != xyes ; then 5973 AC_MSG_ERROR(sendfile support requested but sendfile not available ) 5974 fi 5970 5975 5971 5976 ############################################ -
branches/samba-3.5.x/source3/lib/sysquotas.c
r414 r739 177 177 #ifdef HAVE_XFS_QUOTAS 178 178 {"xfs", sys_get_xfs_quota, sys_set_xfs_quota}, 179 {"gfs", sys_get_xfs_quota, sys_set_xfs_quota}, 180 {"gfs2", sys_get_xfs_quota, sys_set_xfs_quota}, 179 181 #endif /* HAVE_XFS_QUOTAS */ 180 182 {NULL, NULL, NULL} -
branches/samba-3.5.x/source3/libaddns/dnsmarshall.c
r414 r739 28 28 struct dns_buffer *result; 29 29 30 if (!(result = talloc (mem_ctx, struct dns_buffer))) {30 if (!(result = talloc_zero(mem_ctx, struct dns_buffer))) { 31 31 return NULL; 32 32 } … … 40 40 result->size = 2; 41 41 42 if (!(result->data = TALLOC_ ARRAY(result, uint8, result->size))) {42 if (!(result->data = TALLOC_ZERO_ARRAY(result, uint8, result->size))) { 43 43 TALLOC_FREE(result); 44 44 return NULL; … … 217 217 } 218 218 219 if (!(label = talloc (mem_ctx, struct dns_domain_label))) {219 if (!(label = talloc_zero(mem_ctx, struct dns_domain_label))) { 220 220 buf->error = ERROR_DNS_NO_MEMORY; 221 221 return; … … 224 224 label->len = len; 225 225 226 if (!(label->label = TALLOC_ ARRAY(label, char, len+1))) {226 if (!(label->label = TALLOC_ZERO_ARRAY(label, char, len+1))) { 227 227 buf->error = ERROR_DNS_NO_MEMORY; 228 228 goto error; … … 251 251 if (!ERR_DNS_IS_OK(buf->error)) return; 252 252 253 if (!(name = talloc (mem_ctx, struct dns_domain_name))) {253 if (!(name = talloc_zero(mem_ctx, struct dns_domain_name))) { 254 254 buf->error = ERROR_DNS_NO_MEMORY; 255 255 return; … … 282 282 if (!(ERR_DNS_IS_OK(buf->error))) return; 283 283 284 if (!(q = talloc (mem_ctx, struct dns_question))) {284 if (!(q = talloc_zero(mem_ctx, struct dns_question))) { 285 285 buf->error = ERROR_DNS_NO_MEMORY; 286 286 return; … … 315 315 if (!(ERR_DNS_IS_OK(buf->error))) return; 316 316 317 if (!(r = talloc (mem_ctx, struct dns_rrec))) {317 if (!(r = talloc_zero(mem_ctx, struct dns_rrec))) { 318 318 buf->error = ERROR_DNS_NO_MEMORY; 319 319 return; … … 330 330 331 331 if (r->data_length != 0) { 332 if (!(r->data = TALLOC_ ARRAY(r, uint8, r->data_length))) {332 if (!(r->data = TALLOC_ZERO_ARRAY(r, uint8, r->data_length))) { 333 333 buf->error = ERROR_DNS_NO_MEMORY; 334 334 return; … … 407 407 408 408 if ((req->num_questions != 0) && 409 !(req->questions = TALLOC_ ARRAY(req, struct dns_question *,409 !(req->questions = TALLOC_ZERO_ARRAY(req, struct dns_question *, 410 410 req->num_questions))) { 411 411 goto error; 412 412 } 413 413 if ((req->num_answers != 0) && 414 !(req->answers = TALLOC_ ARRAY(req, struct dns_rrec *,414 !(req->answers = TALLOC_ZERO_ARRAY(req, struct dns_rrec *, 415 415 req->num_answers))) { 416 416 goto error; 417 417 } 418 418 if ((req->num_auths != 0) && 419 !(req->auths = TALLOC_ ARRAY(req, struct dns_rrec *,419 !(req->auths = TALLOC_ZERO_ARRAY(req, struct dns_rrec *, 420 420 req->num_auths))) { 421 421 goto error; 422 422 } 423 423 if ((req->num_additionals != 0) && 424 !(req->additionals = TALLOC_ ARRAY(req, struct dns_rrec *,424 !(req->additionals = TALLOC_ZERO_ARRAY(req, struct dns_rrec *, 425 425 req->num_additionals))) { 426 426 goto error; -
branches/samba-3.5.x/source3/libsmb/cliconnect.c
r732 r739 1179 1179 *p = 0; 1180 1180 user = p+1; 1181 strupper_m(user2); 1181 1182 workgroup = user2; 1182 1183 } -
branches/samba-3.5.x/source3/libsmb/clispnego.c
r736 r739 137 137 ASN1_DATA *data; 138 138 139 for (i = 0; i < ASN1_MAX_OIDS; i++) { 140 OIDs[i] = NULL; 141 } 142 139 143 data = asn1_init(talloc_tos()); 140 144 if (data == NULL) { … … 384 388 ASN1_DATA *data; 385 389 int data_remaining; 390 *ticket = data_blob_null; 386 391 387 392 data = asn1_init(talloc_tos()); -
branches/samba-3.5.x/source3/smbd/posix_acls.c
r733 r739 1343 1343 1344 1344 static bool ensure_canon_entry_valid(canon_ace **pp_ace, 1345 const struct share_params *params, 1346 const bool is_directory, 1347 const DOM_SID *pfile_owner_sid, 1348 const DOM_SID *pfile_grp_sid, 1349 const SMB_STRUCT_STAT *pst, 1350 bool setting_acl) 1345 bool is_default_acl, 1346 const struct share_params *params, 1347 const bool is_directory, 1348 const DOM_SID *pfile_owner_sid, 1349 const DOM_SID *pfile_grp_sid, 1350 const SMB_STRUCT_STAT *pst, 1351 bool setting_acl) 1351 1352 { 1352 1353 canon_ace *pace; … … 1359 1360 if (pace->type == SMB_ACL_USER_OBJ) { 1360 1361 1361 if (setting_acl )1362 if (setting_acl && !is_default_acl) { 1362 1363 apply_default_perms(params, is_directory, pace, S_IRUSR); 1364 } 1363 1365 got_user = True; 1364 1366 … … 1369 1371 */ 1370 1372 1371 if (setting_acl )1373 if (setting_acl && !is_default_acl) { 1372 1374 apply_default_perms(params, is_directory, pace, S_IRGRP); 1375 } 1373 1376 got_grp = True; 1374 1377 … … 1379 1382 */ 1380 1383 1381 if (setting_acl )1384 if (setting_acl && !is_default_acl) { 1382 1385 apply_default_perms(params, is_directory, pace, S_IROTH); 1386 } 1383 1387 got_other = True; 1384 1388 pace_other = pace; 1389 1390 } else if (pace->type == SMB_ACL_USER || pace->type == SMB_ACL_GROUP) { 1391 1392 /* 1393 * Ensure create mask/force create mode is respected on set. 1394 */ 1395 1396 if (setting_acl && !is_default_acl) { 1397 apply_default_perms(params, is_directory, pace, S_IRGRP); 1398 } 1385 1399 } 1386 1400 } … … 1426 1440 } 1427 1441 1428 apply_default_perms(params, is_directory, pace, S_IRUSR); 1442 if (!is_default_acl) { 1443 apply_default_perms(params, is_directory, pace, S_IRUSR); 1444 } 1429 1445 } else { 1430 1446 pace->perms = unix_perms_to_acl_perms(pst->st_ex_mode, S_IRUSR, S_IWUSR, S_IXUSR); … … 1452 1468 else 1453 1469 pace->perms = 0; 1454 apply_default_perms(params, is_directory, pace, S_IRGRP); 1470 if (!is_default_acl) { 1471 apply_default_perms(params, is_directory, pace, S_IRGRP); 1472 } 1455 1473 } else { 1456 1474 pace->perms = unix_perms_to_acl_perms(pst->st_ex_mode, S_IRGRP, S_IWGRP, S_IXGRP); … … 1474 1492 if (setting_acl) { 1475 1493 pace->perms = 0; 1476 apply_default_perms(params, is_directory, pace, S_IROTH); 1494 if (!is_default_acl) { 1495 apply_default_perms(params, is_directory, pace, S_IROTH); 1496 } 1477 1497 } else 1478 1498 pace->perms = unix_perms_to_acl_perms(pst->st_ex_mode, S_IROTH, S_IWOTH, S_IXOTH); … … 2319 2339 print_canon_ace_list( "file ace - before valid", file_ace); 2320 2340 2321 if (!ensure_canon_entry_valid(&file_ace, f sp->conn->params,2341 if (!ensure_canon_entry_valid(&file_ace, false, fsp->conn->params, 2322 2342 fsp->is_directory, pfile_owner_sid, pfile_grp_sid, pst, True)) { 2323 2343 free_canon_ace_list(file_ace); … … 2328 2348 print_canon_ace_list( "dir ace - before valid", dir_ace); 2329 2349 2330 if (dir_ace && !ensure_canon_entry_valid(&dir_ace, fsp->conn->params,2350 if (dir_ace && !ensure_canon_entry_valid(&dir_ace, true, fsp->conn->params, 2331 2351 fsp->is_directory, pfile_owner_sid, pfile_grp_sid, pst, True)) { 2332 2352 free_canon_ace_list(file_ace); … … 2417 2437 canon_ace *next_ace = NULL; 2418 2438 int entry_id = SMB_ACL_FIRST_ENTRY; 2439 bool is_default_acl = (the_acl_type == SMB_ACL_TYPE_DEFAULT); 2419 2440 SMB_ACL_ENTRY_T entry; 2420 2441 size_t ace_count; … … 2504 2525 ace->unix_ug = unix_ug; 2505 2526 ace->owner_type = owner_type; 2506 ace->ace_flags = get_pai_flags(pal, ace, (the_acl_type == SMB_ACL_TYPE_DEFAULT));2527 ace->ace_flags = get_pai_flags(pal, ace, is_default_acl); 2507 2528 2508 2529 DLIST_ADD(l_head, ace); … … 2513 2534 */ 2514 2535 2515 if (!ensure_canon_entry_valid(&l_head, conn->params,2536 if (!ensure_canon_entry_valid(&l_head, is_default_acl, conn->params, 2516 2537 S_ISDIR(psbuf->st_ex_mode), powner, pgroup, 2517 2538 psbuf, False)) … … 2523 2544 */ 2524 2545 2525 DEBUG(10,("canonicalise_acl: %s ace entries before arrange :\n", the_acl_type == SMB_ACL_TYPE_ACCESS ? "Access" : "Default"));2546 DEBUG(10,("canonicalise_acl: %s ace entries before arrange :\n", is_default_acl ? "Default" : "Access")); 2526 2547 2527 2548 for ( ace_count = 0, ace = l_head; ace; ace = next_ace, ace_count++) { -
branches/samba-3.5.x/source3/smbd/server.c
r736 r739 561 561 int i; 562 562 char *ports; 563 char *tok; 564 const char *ptr; 563 565 unsigned dns_port = 0; 564 566 … … 582 584 } 583 585 586 for (ptr = ports; 587 next_token_talloc(talloc_tos(),&ptr, &tok, " \t,");) { 588 unsigned port = atoi(tok); 589 590 if (port == 0 || port > 0xffff) { 591 exit_server_cleanly("Invalid port in the config or on " 592 "the commandline specified!"); 593 } 594 } 595 584 596 if (lp_interfaces() && lp_bind_interfaces_only()) { 585 597 /* We have been given an interfaces line, and been … … 593 605 const struct sockaddr_storage *ifss = 594 606 iface_n_sockaddr_storage(i); 595 char *tok;596 const char *ptr;597 607 598 608 if (ifss == NULL) { … … 606 616 next_token_talloc(talloc_tos(),&ptr, &tok, " \t,");) { 607 617 unsigned port = atoi(tok); 608 if (port == 0 || port > 0xffff) {609 continue;610 }611 618 612 619 /* Keep the first port for mDNS service … … 626 633 from anywhere. */ 627 634 628 char *tok;629 const char *ptr;630 635 const char *sock_addr = lp_socket_address(); 631 636 char *sock_tok; … … 645 650 for (ptr=ports; next_token_talloc(talloc_tos(), &ptr, &tok, " \t,"); ) { 646 651 struct sockaddr_storage ss; 647 648 652 unsigned port = atoi(tok); 649 if (port == 0 || port > 0xffff) {650 continue;651 }652 653 653 654 /* Keep the first port for mDNS service -
branches/samba-3.5.x/source3/winbindd/winbindd_cm.c
r733 r739 1624 1624 } 1625 1625 1626 if (!winbindd_can_contact_domain(domain)) {1627 invalidate_cm_connection(&domain->conn);1628 domain->initialized = True;1629 return NT_STATUS_OK;1630 }1631 1632 1626 if (connection_ok(domain)) { 1633 1627 if (!domain->initialized) {
Note:
See TracChangeset
for help on using the changeset viewer.
