[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4379-ge64c4ff

[Günther Deschner]

The branch, v3-3-test has been updated
       via  e64c4ff6061422f79e550810affd1c90c7eb22a0 (commit)
      from  0d874b23a43778931c0c570c5aa77bec6888d21d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


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

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

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

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


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c
index cc6bf22..e94f9af 100644
--- a/source/nsswitch/pam_winbind.c
+++ b/source/nsswitch/pam_winbind.c
@@ -552,14 +552,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