[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1573-gaa84ca6

[Günther Deschner]

The branch, master has been updated
       via  aa84ca6e6ba66536ca32dc5792d27e2169589a14 (commit)
       via  d3a9ee689d636f13f7935d1ddfccfdd4f4e8527a (commit)
      from  3e2975b3bdd247d1e3e7c74bada2f85a1936acaf (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit aa84ca6e6ba66536ca32dc5792d27e2169589a14
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 12 23:50:37 2009 +0200

    error-codes: add some more WERRORs to table.
    
    These tables really should be auto-generated at some point...
    
    Guenther

commit d3a9ee689d636f13f7935d1ddfccfdd4f4e8527a
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 12 23:47:21 2009 +0200

    s3-netdomjoin-gui: Fix join prompt dialog test.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 libcli/util/doserr.c                               |    2 ++
 .../examples/netdomjoin-gui/netdomjoin-gui.c       |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index a7a132f..ed220cc 100644
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -177,6 +177,8 @@ static const struct werror_code_struct dos_errs[] =
 	{ "WERR_PASSWORD_MUST_CHANGE", WERR_PASSWORD_MUST_CHANGE },
 	{ "WERR_ACCOUNT_LOCKED_OUT", WERR_ACCOUNT_LOCKED_OUT },
 	{ "WERR_UNKNOWN_PRINT_MONITOR", WERR_UNKNOWN_PRINT_MONITOR },
+	{ "WERR_PASSWORD_RESTRICTION", WERR_PASSWORD_RESTRICTION },
+	{ "WERR_WRONG_PASSWORD", WERR_WRONG_PASSWORD },
 	{ NULL, W_ERROR(0) }
 };
 
diff --git a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index 2af4edd..7652b45 100644
--- a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
+++ b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
@@ -746,7 +746,7 @@ static void callback_do_join(GtkWidget *widget,
 		if (!state->account || !state->password) {
 			debug("callback_do_join: no creds yet\n");
 			callback_creds_prompt(NULL, state,
-					      "Enter the name and password of an account with permission to leave the domain.",
+					      "Enter the name and password of an account with permission to join the domain.",
 					      callback_do_storeauth_and_continue);
 		}
 


-- 
Samba Shared Repository