[SCM] Samba Shared Repository - branch master updated - 29f2ca8ff2b0ea5ac4639530d2d10eecff0d5eec

[Günther Deschner]

The branch, master has been updated
       via  29f2ca8ff2b0ea5ac4639530d2d10eecff0d5eec (commit)
      from  806a45c3c7e33fad90597f87373a532016e614e3 (commit)

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


- Log -----------------------------------------------------------------
commit 29f2ca8ff2b0ea5ac4639530d2d10eecff0d5eec
Author: Bo Yang <boyang at novell.com>
Date:   Sun Nov 16 16:31:31 2008 +0800

        Fix broken msgids in ntstatus_errors
    
    Signed-off-by: Günther Deschner <gd at samba.org>

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

Summary of changes:
 source3/nsswitch/pam_winbind.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index c164f8e..1daa05e 100644
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -598,14 +598,14 @@ static const struct ntstatus_errors {
 	{"NT_STATUS_INVALID_LOGON_HOURS",
 		N_("You are not allowed to logon at this time")},
 	{"NT_STATUS_ACCOUNT_EXPIRED",
-		N_("Your account has expired. ")
-		N_("Please contact your System administrator")}, /* SCNR */
+		N_("Your account has expired. "
+		   "Please contact your System administrator")}, /* SCNR */
 	{"NT_STATUS_ACCOUNT_DISABLED",
-		N_("Your account is disabled. ")
-		N_("Please contact your System administrator")}, /* SCNR */
+		N_("Your account is disabled. "
+		   "Please contact your System administrator")}, /* SCNR */
 	{"NT_STATUS_ACCOUNT_LOCKED_OUT",
-		N_("Your account has been locked. ")
-		N_("Please contact your System administrator")}, /* SCNR */
+		N_("Your account has been locked. "
+		   "Please contact your System administrator")}, /* SCNR */
 	{"NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT",
 		N_("Invalid Trust Account")},
 	{"NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT",


-- 
Samba Shared Repository