The branch, v3-5-stable has been updated via 4e8c70e... Fix bug #7020 - smbd using 2G memory. via 02c9d04... s3: List trusted domains from wcache when domain is offline. via a246c49... s3: Make winbindd_cache.c aware of domain offline to avoid unnecessary backend query. via 2764612... s3: Fix infinite loop in NCACN_IP_TCP asa there is no timeout. Assume lsa_pipe_tcp is ok but network is down, then send request is ok, but select() on writeable fds loops forever since there is no response. via f5e81c5... s3 net: Fix up a share type translation and translate some more strings (cherry picked from commit da41f23bdad1ea3a1a49110217cfde3efcde5075) (cherry picked from commit 0272f44061fa9205bb744e286b6203e15e157a6e) via b9d00a6... s3 net: Add a few missing gettext calls. via a63b54a... net: Add some German translation from ea57f91... VERSION: Raise version number up to 3.5.0rc1.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable - Log ----------------------------------------------------------------- commit 4e8c70e288f15cdd55f40b0ab6e8beee180b4751 Author: Jeremy Allison <j...@samba.org> Date: Tue Jan 5 14:34:00 2010 -0800 Fix bug #7020 - smbd using 2G memory. When deferring an async pipe writeX and readX transfer the outstanding request struct onto the conn struct. This needs freeing after the packet is finally processed. Jeremy. (cherry picked from commit f6bd654a6c878111f0f0f4d07adb644fc3bbf224) (cherry picked from commit b63539809d022f7012f4899a5a18a835079d6c6f) commit 02c9d04b9e2c42635f3c82fd2b5f5ebf0a1d2d8e Author: Bo Yang <boy...@samba.org> Date: Wed Jan 6 19:13:59 2010 +0800 s3: List trusted domains from wcache when domain is offline. Signed-off-by: Bo Yang <boy...@samba.org> (cherry picked from commit d06fb8e02706559e91c6d185427409bb093bb896) (cherry picked from commit 65003db3685098dd3b8370c5a6fc673c9eba5d7a) commit a246c49e80420f3dcc8893b8b48a90a6db3f8b16 Author: Bo Yang <boy...@samba.org> Date: Wed Jan 6 15:05:20 2010 +0800 s3: Make winbindd_cache.c aware of domain offline to avoid unnecessary backend query. Signed-off-by: Bo Yang <boy...@samba.org> (cherry picked from commit 133638c8aea7280d01b5a23150428977e9ff0e11) (cherry picked from commit 063a2ceb9192a5b1820a7e115decc49357f2b3b6) commit 2764612487697e2e35bede3dbf4f41c1fea0e9c7 Author: Bo Yang <boy...@samba.org> Date: Wed Jan 6 12:13:35 2010 +0800 s3: Fix infinite loop in NCACN_IP_TCP asa there is no timeout. Assume lsa_pipe_tcp is ok but network is down, then send request is ok, but select() on writeable fds loops forever since there is no response. Signed-off-by: Bo Yang <boy...@samba.org> (cherry picked from commit 36493bf2f6634b84c57107bcb86bcbf3e82e80fc) (cherry picked from commit b58b359881c91ec382cfa1d6ba3007b8354b29cb) commit f5e81c55a768027fc9fb72122a54913b0e5f8a2d Author: Kai Blin <k...@samba.org> Date: Tue Jan 5 09:54:04 2010 +0100 s3 net: Fix up a share type translation and translate some more strings (cherry picked from commit da41f23bdad1ea3a1a49110217cfde3efcde5075) (cherry picked from commit 0272f44061fa9205bb744e286b6203e15e157a6e) commit b9d00a64d2f71a2b268ffdff4c8c918f44f8a749 Author: Kai Blin <k...@samba.org> Date: Tue Jan 5 09:43:34 2010 +0100 s3 net: Add a few missing gettext calls. Many many thanks to Adi Roiban from #ubuntu-translators for helping me find and fix my problems with the translations. (cherry picked from commit 9a9d737070bfde62f2d5a35ad25606da578f9f7e) (cherry picked from commit dda309191e8927ffcea8724db1a65c422f90e6b9) commit a63b54a541c97d52c4f715f54415bf8695b6dd9f Author: André Hentschel <n...@dawncrow.de> Date: Mon Dec 28 02:58:40 2009 +0100 net: Add some German translation Signed-off-by: Kai Blin <k...@samba.org> (cherry picked from commit b0dd364cdde107577c74a91f3a65989e97a2c073) (cherry picked from commit ba2cc29fe0ebdaaaa4282ddd19026759bae2c93c) ----------------------------------------------------------------------- Summary of changes: source3/include/proto.h | 5 + source3/locale/net/de.po | 2070 ++++++++++++++++--------------- source3/rpc_client/cli_pipe.c | 26 +- source3/rpc_client/ndr.c | 15 + source3/rpc_client/rpc_transport_np.c | 12 + source3/rpc_client/rpc_transport_smbd.c | 10 + source3/rpc_client/rpc_transport_sock.c | 53 + source3/smbd/pipes.c | 10 + source3/utils/net_help.c | 4 +- source3/utils/net_util.c | 8 +- source3/winbindd/winbindd_cache.c | 380 ++++++- source3/winbindd/winbindd_cm.c | 3 +- source3/winbindd/winbindd_rpc.c | 14 +- 13 files changed, 1603 insertions(+), 1007 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index d2ebd92..b3512d9 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5377,6 +5377,7 @@ NTSTATUS rpc_transport_np_init(TALLOC_CTX *mem_ctx, struct cli_state *cli, const struct ndr_syntax_id *abstract_syntax, struct rpc_cli_transport **presult); struct cli_state *rpc_pipe_np_smb_conn(struct rpc_pipe_client *p); +void rpccli_close_np_fd(struct rpc_pipe_client *p); /* The following definitions come from rpc_client/rpc_transport_smbd.c */ @@ -5407,11 +5408,15 @@ NTSTATUS rpc_transport_smbd_init(TALLOC_CTX *mem_ctx, struct rpc_cli_smbd_conn *conn, const struct ndr_syntax_id *abstract_syntax, struct rpc_cli_transport **presult); +struct cli_state *rpc_pipe_smbd_smb_conn(struct rpc_pipe_client *p); /* The following definitions come from rpc_client/rpc_transport_sock.c */ NTSTATUS rpc_transport_sock_init(TALLOC_CTX *mem_ctx, int fd, struct rpc_cli_transport **presult); +int rpccli_set_sock_timeout(struct rpc_pipe_client *rpccli, int timeout); +void rpccli_close_sock_fd(struct rpc_pipe_client *rpccli); +bool rpc_pipe_tcp_connection_ok(struct rpc_pipe_client *rpccli); /* The following definitions come from rpc_client/cli_samr.c */ diff --git a/source3/locale/net/de.po b/source3/locale/net/de.po index a336936..e1ccb32 100644 --- a/source3/locale/net/de.po +++ b/source3/locale/net/de.po @@ -1,5 +1,6 @@ # net message translation (german). # Copyright (C) 2009 Kai Blin <k...@samba.org> +# Copyright (C) 2009 André Hentschel <n...@dawncrow.de> # This file is distributed under the same license as the samba package. # #, fuzzy @@ -7,9 +8,10 @@ msgid "" msgstr "" "Project-Id-Version: @pack...@\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-11 09:01+0200\n" -"PO-Revision-Date: 2009-08-06 20:45+0200\n" -"Last-Translator: Kai Blin <k...@samba.org>\n" +"POT-Creation-Date: 2010-01-05 09:23+0100\n" +"PO-Revision-Date: 2009-12-26 19:20+0100\n" +"Last-Translator: André Hentschel <n...@dawncrow.de>\n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -33,216 +35,269 @@ msgid "" "This function will change the ADS Domain member machine account password in the secrets.tdb file!\n" msgstr "" -#: ../../utils/net.c:150 ../../utils/net.c:228 +#: ../../utils/net.c:132 +msgid "Failed to open secrets.tdb.\n" +msgstr "" + +#: ../../utils/net.c:139 ../../utils/net.c:157 ../../utils/net_conf.c:1136 ../../utils/net_help.c:36 ../../utils/net_rap.c:161 ../../utils/net_rap.c:302 ../../utils/net_rap.c:467 ../../utils/net_rap.c:750 ../../utils/net_rap.c:891 +#: ../../utils/net_rap.c:1002 ../../utils/net_rap.c:1193 ../../utils/net_rpc.c:979 ../../utils/net_rpc.c:2820 ../../utils/net_rpc.c:4923 ../../utils/net_rpc.c:6962 ../../utils/net_rpc.c:7067 ../../utils/net_util.c:586 +msgid "Usage:\n" +msgstr "Verwendung:\n" + +#: ../../utils/net.c:141 +#, c-format +msgid "" +" net setauthuser -U user[%%password] \n" +" Set the auth user account to userpassword. Prompt for password if not specified.\n" +msgstr "" + +#: ../../utils/net.c:146 ../../utils/net.c:164 +msgid "" +" net setauthuser delete\n" +" Delete the auth user setting.\n" +msgstr "" + +#: ../../utils/net.c:159 +#, c-format +msgid "" +" net setauthuser -U user[%%password]\n" +" Set the auth user account to userpassword. Prompt for password if not specified.\n" +msgstr "" + +#: ../../utils/net.c:169 +msgid "the auth user" +msgstr "" + +#: ../../utils/net.c:171 +msgid "Failed to get the auth users password.\n" +msgstr "" + +#: ../../utils/net.c:177 +msgid "error storing auth user name\n" +msgstr "" + +#: ../../utils/net.c:183 +msgid "error storing auth user domain\n" +msgstr "" + +#: ../../utils/net.c:189 +msgid "error storing auth user password\n" +msgstr "" + +#: ../../utils/net.c:213 +msgid "No authorised user configured\n" +msgstr "" + +#: ../../utils/net.c:255 ../../utils/net.c:333 #, c-format msgid "Unable to open secrets.tdb. Can't fetch domain SID for name: %s\n" msgstr "" -#: ../../utils/net.c:163 ../../utils/net.c:251 +#: ../../utils/net.c:268 ../../utils/net.c:356 #, c-format msgid "SID for domain %s is: %s\n" msgstr "" -#: ../../utils/net.c:175 +#: ../../utils/net.c:280 msgid "usage: net setlocalsid S-1-5-21-x-y-z\n" msgstr "" -#: ../../utils/net.c:195 +#: ../../utils/net.c:300 msgid "usage: net setdomainsid S-1-5-21-x-y-z\n" msgstr "" -#: ../../utils/net.c:213 +#: ../../utils/net.c:318 msgid "usage: net getdomainsid\n" msgstr "" -#: ../../utils/net.c:238 +#: ../../utils/net.c:343 msgid "Could not fetch local SID\n" msgstr "" -#: ../../utils/net.c:242 +#: ../../utils/net.c:347 #, c-format msgid "SID for local machine %s is: %s\n" msgstr "" -#: ../../utils/net.c:246 +#: ../../utils/net.c:351 msgid "Could not fetch domain SID\n" msgstr "" -#: ../../utils/net.c:263 +#: ../../utils/net.c:368 #, c-format msgid "get_maxrid: Could not search %s\n" msgstr "" -#: ../../utils/net.c:297 +#: ../../utils/net.c:402 msgid "usage: net maxrid\n" msgstr "" -#: ../../utils/net.c:302 +#: ../../utils/net.c:407 msgid "can't get current maximum rid\n" msgstr "" -#: ../../utils/net.c:306 +#: ../../utils/net.c:411 #, c-format msgid "Currently used maximum rid: %d\n" msgstr "" -#: ../../utils/net.c:317 +#: ../../utils/net.c:422 msgid "Run functions using RPC transport" -msgstr "" +msgstr "RPC Protokoll nutzen" -#: ../../utils/net.c:318 +#: ../../utils/net.c:423 msgid " Use 'net help rpc' to get more extensive information about 'net rpc' commands." msgstr "" -#: ../../utils/net.c:325 +#: ../../utils/net.c:430 msgid "Run functions using RAP transport" -msgstr "" +msgstr "RAP Protokoll nutzen" -#: ../../utils/net.c:326 +#: ../../utils/net.c:431 msgid " Use 'net help rap' to get more extensive information about 'net rap' commands." msgstr "" -#: ../../utils/net.c:333 +#: ../../utils/net.c:438 msgid "Run functions using ADS transport" -msgstr "" +msgstr "ADS Protokoll nutzen" -#: ../../utils/net.c:334 +#: ../../utils/net.c:439 msgid " Use 'net help ads' to get more extensive information about 'net ads' commands." msgstr "" -#: ../../utils/net.c:343 +#: ../../utils/net.c:448 msgid "Functions on remote opened files" -msgstr "" +msgstr "Freigegebene Dateien verwalten" -#: ../../utils/net.c:344 +#: ../../utils/net.c:449 msgid " Use 'net help file' to get more information about 'net file' commands." msgstr "" -#: ../../utils/net.c:351 +#: ../../utils/net.c:456 msgid "Functions on shares" -msgstr "" +msgstr "Freigaben verwalten" -#: ../../utils/net.c:352 +#: ../../utils/net.c:457 msgid " Use 'net help share' to get more information about 'net share' commands." msgstr "" -#: ../../utils/net.c:359 +#: ../../utils/net.c:464 msgid "Manage sessions" -msgstr "" +msgstr "Sitzungen verwalten" -#: ../../utils/net.c:360 +#: ../../utils/net.c:465 msgid " Use 'net help session' to get more information about 'net session' commands." msgstr "" -#: ../../utils/net.c:367 ../../utils/net_rap.c:1291 +#: ../../utils/net.c:472 ../../utils/net_rap.c:1291 msgid "List servers in workgroup" -msgstr "" +msgstr "Server der Arbeitsgruppe auflisten" -#: ../../utils/net.c:368 +#: ../../utils/net.c:473 msgid " Use 'net help server' to get more information about 'net server' commands." msgstr "" -#: ../../utils/net.c:375 +#: ../../utils/net.c:480 msgid "List domains/workgroups on network" -msgstr "" +msgstr "Domänen/Arbeitsgruppen im Netzwerk auflisten" -#: ../../utils/net.c:376 +#: ../../utils/net.c:481 msgid " Use 'net help domain' to get more information about 'net domain' commands." msgstr "" -#: ../../utils/net.c:383 +#: ../../utils/net.c:488 msgid "Modify printer queue" msgstr "" -#: ../../utils/net.c:384 +#: ../../utils/net.c:489 msgid " Use 'net help printq' to get more information about 'net printq' commands." msgstr "" -#: ../../utils/net.c:391 +#: ../../utils/net.c:496 msgid "Manage users" -msgstr "" +msgstr "Benutzer verwalten" -#: ../../utils/net.c:392 +#: ../../utils/net.c:497 msgid " Use 'net help user' to get more information about 'net user' commands." msgstr "" -#: ../../utils/net.c:399 +#: ../../utils/net.c:504 msgid "Manage groups" -msgstr "" +msgstr "Gruppen verwalten" -#: ../../utils/net.c:400 +#: ../../utils/net.c:505 msgid " Use 'net help group' to get more information about 'net group' commands." msgstr "" -#: ../../utils/net.c:407 +#: ../../utils/net.c:512 msgid "Manage group mappings" -msgstr "" +msgstr "Gruppenzuweisungen verwalten" -#: ../../utils/net.c:408 +#: ../../utils/net.c:513 msgid " Use 'net help groupmap' to get more information about 'net groupmap' commands." msgstr "" -#: ../../utils/net.c:415 +#: ../../utils/net.c:520 msgid "Functions on the SAM database" msgstr "" -#: ../../utils/net.c:416 +#: ../../utils/net.c:521 msgid " Use 'net help sam' to get more information about 'net sam' commands." msgstr "" -#: ../../utils/net.c:423 +#: ../../utils/net.c:528 msgid "Validate username and password" msgstr "" -#: ../../utils/net.c:424 +#: ../../utils/net.c:529 msgid " Use 'net help validate' to get more information about 'net validate' commands." msgstr "" -#: ../../utils/net.c:431 +#: ../../utils/net.c:536 msgid "Modify group memberships" -msgstr "" +msgstr "Gruppenzugehörigkeiten verwalten" -#: ../../utils/net.c:432 +#: ../../utils/net.c:537 msgid " Use 'net help groupmember' to get more information about 'net groupmember' commands." msgstr "" -#: ../../utils/net.c:438 +#: ../../utils/net.c:543 msgid "Execute remote command on a remote OS/2 server" -msgstr "" +msgstr "Befehl auf einem entfernten OS/2 Server ausführen" -#: ../../utils/net.c:439 +#: ../../utils/net.c:544 msgid " Use 'net help admin' to get more information about 'net admin' commands." msgstr "" -#: ../../utils/net.c:445 +#: ../../utils/net.c:550 msgid "List/modify running services" -msgstr "" +msgstr "Zeige/Ãndere laufende Dienste" -#: ../../utils/net.c:446 +#: ../../utils/net.c:551 msgid " Use 'net help service' to get more information about 'net service' commands." msgstr "" -#: ../../utils/net.c:453 +#: ../../utils/net.c:558 msgid "Change user password on target server" msgstr "" -#: ../../utils/net.c:454 +#: ../../utils/net.c:559 msgid " Use 'net help password' to get more information about 'net password' commands." msgstr "" -#: ../../utils/net.c:460 +#: ../../utils/net.c:565 msgid "Change the trust password" msgstr "" -#: ../../utils/net.c:461 +#: ../../utils/net.c:566 msgid " Use 'net help changetrustpw' to get more information about 'net changetrustpw'." msgstr "" -#: ../../utils/net.c:467 +#: ../../utils/net.c:572 msgid "Change the secret password" -msgstr "" +msgstr "Das geheime Passwort ändern" -#: ../../utils/net.c:468 +#: ../../utils/net.c:573 msgid "" " net [options] changesecretpw\n" " Change the ADS domain member machine account password in secrets.tdb.\n" @@ -250,169 +305,193 @@ msgid "" " Requires the -f flag to work." msgstr "" -#: ../../utils/net.c:477 -msgid "Show/set time" +#: ../../utils/net.c:583 +msgid "Set the winbind auth user" msgstr "" -#: ../../utils/net.c:478 +#: ../../utils/net.c:584 +#, c-format +msgid "" +" net -U user[%%password] [-W domain] setauthuser\n" +" Set the auth user, password (and optionally domain\n" +" Will prompt for password if not given.\n" +" net setauthuser delete\n" +" Delete the existing auth user settings." +msgstr "" + +#: ../../utils/net.c:594 +msgid "Get the winbind auth user settings" +msgstr "" + +#: ../../utils/net.c:595 +msgid "" +" net getauthuser\n" +" Get the current winbind auth user settings." +msgstr "" + +#: ../../utils/net.c:601 +msgid "Show/set time" +msgstr "Zeigt/Setzt die Systemzeit" + +#: ../../utils/net.c:602 msgid " Use 'net help time' to get more information about 'net time' commands." msgstr "" -#: ../../utils/net.c:484 +#: ../../utils/net.c:608 msgid "Look up host names/IP addresses" msgstr "" -#: ../../utils/net.c:485 +#: ../../utils/net.c:609 msgid " Use 'net help lookup' to get more information about 'net lookup' commands." msgstr "" -#: ../../utils/net.c:491 +#: ../../utils/net.c:615 msgid "Join a domain/AD" -msgstr "" +msgstr "Einer Domäne/AD beitreten" -#: ../../utils/net.c:492 +#: ../../utils/net.c:616 msgid " Use 'net help join' to get more information about 'net join'." msgstr "" -#: ../../utils/net.c:498 +#: ../../utils/net.c:622 msgid "Join/unjoin (remote) machines to/from a domain/AD" msgstr "" -#: ../../utils/net.c:499 +#: ../../utils/net.c:623 msgid " Use 'net help dom' to get more information about 'net dom' commands." msgstr "" -#: ../../utils/net.c:505 +#: ../../utils/net.c:629 msgid "Operate on the cache tdb file" msgstr "" -#: ../../utils/net.c:506 +#: ../../utils/net.c:630 msgid " Use 'net help cache' to get more information about 'net cache' commands." msgstr "" -#: ../../utils/net.c:512 +#: ../../utils/net.c:636 msgid "Get the SID for the local domain" msgstr "" -#: ../../utils/net.c:513 +#: ../../utils/net.c:637 msgid " net getlocalsid" msgstr "" -#: ../../utils/net.c:518 +#: ../../utils/net.c:642 msgid "Set the SID for the local domain" msgstr "" -#: ../../utils/net.c:519 +#: ../../utils/net.c:643 msgid " net setlocalsid S-1-5-21-x-y-z" msgstr "" -#: ../../utils/net.c:524 +#: ../../utils/net.c:648 msgid "Set domain SID on member servers" msgstr "" -#: ../../utils/net.c:525 +#: ../../utils/net.c:649 msgid " net setdomainsid S-1-5-21-x-y-z" msgstr "" -- Samba Shared Repository