Changeset 158 for branches/samba-3.0/source
- Timestamp:
- Sep 30, 2008, 7:14:08 AM (17 years ago)
- Location:
- branches/samba-3.0/source
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/samba-3.0/source/VERSION
r140 r158 26 26 SAMBA_VERSION_MAJOR=3 27 27 SAMBA_VERSION_MINOR=0 28 SAMBA_VERSION_RELEASE=3 128 SAMBA_VERSION_RELEASE=32 29 29 30 30 ######################################################## -
branches/samba-3.0/source/dynconfig.c
r13 r158 59 59 { 60 60 static pstring buffer = ""; 61 #if 162 61 if (!*buffer) 63 62 { 64 63 snprintf(buffer, 260, "%s/samba/log", getenv("ETC")); 65 64 } 66 #endif67 65 return buffer; 68 66 } -
branches/samba-3.0/source/include/version.h
r140 r158 2 2 #define SAMBA_VERSION_MAJOR 3 3 3 #define SAMBA_VERSION_MINOR 0 4 #define SAMBA_VERSION_RELEASE 3 15 #define SAMBA_VERSION_OFFICIAL_STRING "3.0.3 1"4 #define SAMBA_VERSION_RELEASE 32 5 #define SAMBA_VERSION_OFFICIAL_STRING "3.0.32" 6 6 #define SAMBA_VERSION_STRING samba_version_string() -
branches/samba-3.0/source/lib/interface.c
r22 r158 302 302 303 303 /**************************************************************************** 304 how many non-loopback interfaces do we have 305 **************************************************************************/ 306 int iface_count_nl(void) 307 { 308 int ret = 0; 309 struct interface *i; 310 311 for (i=local_interfaces;i;i=i->next) { 312 if (ip_equal(i->ip, loopback_ip)) { 313 continue; 314 } 315 ret++; 316 } 317 return ret; 318 } 319 320 /**************************************************************************** 304 321 return the Nth interface 305 322 **************************************************************************/ -
branches/samba-3.0/source/nmbd/nmbd.c
r134 r158 249 249 BlockSignals(false, SIGTERM); 250 250 251 while (iface_count () == 0 && !got_sig_term) {251 while (iface_count_nl() == 0 && !got_sig_term) { 252 252 sleep(5); 253 253 load_interfaces(); -
branches/samba-3.0/source/nmbd/nmbd_subnetdb.c
r134 r158 187 187 try_interfaces_again: 188 188 189 if (iface_count () == 0) {190 DEBUG(0,("create_subnets: No local interfaces !\n"));189 if (iface_count_nl() == 0) { 190 DEBUG(0,("create_subnets: No non-loopback local interfaces !\n")); 191 191 DEBUG(0,("create_subnets: Waiting for an interface to appear ...\n")); 192 192 } 193 193 194 while (iface_count () == 0) {194 while (iface_count_nl() == 0) { 195 195 void (*saved_handler)(int); 196 196 -
branches/samba-3.0/source/nsswitch/wb_common.c
r71 r158 183 183 184 184 if (lstat(dir, &st) == -1) { 185 errno = ENOENT; 185 186 return -1; 186 187 } … … 188 189 if (!S_ISDIR(st.st_mode) || 189 190 (st.st_uid != 0 && st.st_uid != geteuid())) { 191 errno = ENOENT; 190 192 return -1; 191 193 } … … 211 213 212 214 if (lstat(path, &st) == -1) { 215 errno = ENOENT; 213 216 return -1; 214 217 } … … 218 221 if (!S_ISSOCK(st.st_mode) || 219 222 (st.st_uid != 0 && st.st_uid != geteuid())) { 223 errno = ENOENT; 220 224 return -1; 221 225 } … … 364 368 365 369 if (winbind_open_pipe_sock(recursing, need_priv) == -1) { 370 errno = ENOENT; 366 371 return -1; 367 372 } … … 571 576 if (write_sock(request, sizeof(*request), 572 577 request->flags & WBFLAG_RECURSE, need_priv) == -1) { 578 /* Set ENOENT for consistency. Required by some apps */ 579 errno = ENOENT; 580 573 581 return NSS_STATUS_UNAVAIL; 574 582 } … … 577 585 (write_sock(request->extra_data.data, request->extra_len, 578 586 request->flags & WBFLAG_RECURSE, need_priv) == -1)) { 587 /* Set ENOENT for consistency. Required by some apps */ 588 errno = ENOENT; 589 579 590 return NSS_STATUS_UNAVAIL; 580 591 } … … 600 611 /* Wait for reply */ 601 612 if (read_reply(response) == -1) { 613 /* Set ENOENT for consistency. Required by some apps */ 614 errno = ENOENT; 615 602 616 return NSS_STATUS_UNAVAIL; 603 617 } -
branches/samba-3.0/source/nsswitch/winbindd.c
r140 r158 47 47 /* Reload configuration */ 48 48 49 static BOOL reload_services_file( void)49 static BOOL reload_services_file(const char *logfile) 50 50 { 51 51 BOOL ret; … … 62 62 reopen_logs(); 63 63 ret = lp_load(dyn_CONFIGFILE,False,False,True,True); 64 65 /* if this is a child, restore the logfile to the special 66 name - <domain>, idmap, etc. */ 67 if (logfile && *logfile) 68 lp_set_logfile(logfile); 64 69 65 70 reopen_logs(); … … 189 194 /* Flush various caches */ 190 195 flush_caches(); 191 reload_services_file( );196 reload_services_file((const char *) private_data); 192 197 } 193 198 … … 727 732 728 733 /* check if HUP has been received and reload files */ 729 void winbind_check_sighup( void)734 void winbind_check_sighup(const char *logfile) 730 735 { 731 736 if (do_sighup) { … … 733 738 DEBUG(3, ("got SIGHUP\n")); 734 739 735 msg_reload_services(MSG_SMB_CONF_UPDATED, pid_to_procid(0), NULL, 0, NULL);740 msg_reload_services(MSG_SMB_CONF_UPDATED, pid_to_procid(0), NULL, 0, logfile); 736 741 do_sighup = False; 737 742 } … … 910 915 911 916 winbind_check_sigterm(true); 912 winbind_check_sighup( );917 winbind_check_sighup(NULL); 913 918 914 919 if (do_sigusr2) { … … 1008 1013 COPYRIGHT_STARTUP_MESSAGE) ); 1009 1014 1010 if (!reload_services_file( )) {1015 if (!reload_services_file(NULL)) { 1011 1016 DEBUG(0, ("error opening config file\n")); 1012 1017 exit(1); -
branches/samba-3.0/source/nsswitch/winbindd_dual.c
r140 r158 103 103 }; 104 104 105 static void async_request_fail(struct winbindd_async_request *state); 105 106 static void async_main_request_sent(void *private_data, BOOL success); 106 107 static void async_request_sent(void *private_data, BOOL success); … … 128 129 state->mem_ctx = mem_ctx; 129 130 state->child = child; 131 state->reply_timeout_event = NULL; 130 132 state->request = request; 131 133 state->response = response; … … 147 149 if (!success) { 148 150 DEBUG(5, ("Could not send async request\n")); 149 150 state->response->length = sizeof(struct winbindd_response); 151 state->response->result = WINBINDD_ERROR; 152 state->continuation(state->private_data, False); 151 async_request_fail(state); 153 152 return; 154 153 } … … 1025 1024 /* check for signals */ 1026 1025 winbind_check_sigterm(false); 1027 winbind_check_sighup(); 1026 winbind_check_sighup(override_logfile ? NULL : 1027 child->logfilename); 1028 1028 1029 1029 run_events(winbind_event_context(), 0, NULL, NULL); -
branches/samba-3.0/source/nsswitch/winbindd_proto.h
r140 r158 19 19 void request_ok(struct winbindd_cli_state *state); 20 20 void request_finished_cont(void *private_data, BOOL success); 21 void winbind_check_sighup( void);21 void winbind_check_sighup(const char *logfile); 22 22 void winbind_check_sigterm(bool in_parent); 23 23 int main(int argc, char **argv, char **envp); -
branches/samba-3.0/source/printing/printing.c
r134 r158 2398 2398 if ((vuser = get_valid_user_struct(user->vuid)) != NULL) { 2399 2399 fstrcpy(pjob.user, lp_printjob_username(snum)); 2400 standard_sub_basic(vuser->user.smb_name, vuser->user.domain, 2401 pjob.user, sizeof(pjob.user)-1); 2400 standard_sub_advanced(sharename, vuser->user.smb_name, path, 2401 vuser->gid, vuser->user.smb_name, 2402 vuser->user.domain, pjob.user, 2403 sizeof(pjob.user) - 1); 2402 2404 /* ensure NULL termination */ 2403 2405 pjob.user[sizeof(pjob.user)-1] = '\0'; -
branches/samba-3.0/source/smbd/sesssetup.c
r134 r158 1511 1511 } 1512 1512 1513 nt_status = create_local_token(server_info); 1514 if (!NT_STATUS_IS_OK(nt_status)) { 1515 DEBUG(10, ("create_local_token failed: %s\n", 1516 nt_errstr(nt_status))); 1517 data_blob_free(&nt_resp); 1518 data_blob_free(&lm_resp); 1519 data_blob_clear_free(&plaintext_password); 1520 return ERROR_NT(nt_status_squash(nt_status)); 1513 if (!server_info->ptok) { 1514 nt_status = create_local_token(server_info); 1515 if (!NT_STATUS_IS_OK(nt_status)) { 1516 DEBUG(10, ("create_local_token failed: %s\n", 1517 nt_errstr(nt_status))); 1518 data_blob_free(&nt_resp); 1519 data_blob_free(&lm_resp); 1520 data_blob_clear_free(&plaintext_password); 1521 return ERROR_NT(nt_status_squash(nt_status)); 1522 } 1521 1523 } 1522 1524 -
branches/samba-3.0/source/utils/net.c
r140 r158 497 497 } 498 498 499 if (opt_user_name && opt_password) {499 if (opt_user_name) { 500 500 nt_status = connect_to_ipc(&cli, &server_ip, server_name); 501 501 if (NT_STATUS_IS_OK(nt_status)) {
Note:
See TracChangeset
for help on using the changeset viewer.