1 files changed, 63 insertions, 34 deletions

diff --git a/nis/nis_error.c b/nis/nis_error.c
index d92ad03604..147f88ce15 100644
--- a/nis/nis_error.c
+++ b/nis/nis_error.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997,1998,1999,2004,2005,2006 Free Software Foundation, Inc.
+/* Copyright (c) 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
 
@@ -24,41 +24,65 @@
 #include <rpcsvc/nis.h>
 
 
-#define MF(line) MF1 (line)
-#define MF1(line) str##line
-static const union msgstr_t
+static const char *nis_errlist[] =
 {
-  struct
-  {
-#define S(s) char MF(__LINE__)[sizeof (s)];
-#include "nis_error.h"
-#undef S
-  };
-  char str[0];
-} msgstr =
-  {
-    {
-#define S(s) s,
-#include "nis_error.h"
-#undef S
-    }
-  };
-
-static const unsigned short int msgidx[] =
-  {
-#define S(s) offsetof (union msgstr_t, MF (__LINE__)),
-#include "nis_error.h"
-#undef S
-  };
-
+  N_("Success"),
+  N_("Probable success"),
+  N_("Not found"),
+  N_("Probably not found"),
+  N_("Cache expired"),
+  N_("NIS+ servers unreachable"),
+  N_("Unknown object"),
+  N_("Server busy, try again"),
+  N_("Generic system error"),
+  N_("First/next chain broken"),
+  N_("Permission denied"),
+  N_("Not owner"),
+  N_("Name not served by this server"),
+  N_("Server out of memory"),
+  N_("Object with same name exists"),
+  N_("Not master server for this domain"),
+  N_("Invalid object for operation"),
+  N_("Malformed name, or illegal name"),
+  N_("Unable to create callback"),
+  N_("Results sent to callback proc"),
+  N_("Not found, no such name"),
+  N_("Name/entry isn't unique"),
+  N_("Modification failed"),
+  N_("Database for table does not exist"),
+  N_("Entry/table type mismatch"),
+  N_("Link points to illegal name"),
+  N_("Partial success"),
+  N_("Too many attributes"),
+  N_("Error in RPC subsystem"),
+  N_("Missing or malformed attribute"),
+  N_("Named object is not searchable"),
+  N_("Error while talking to callback proc"),
+  N_("Non NIS+ namespace encountered"),
+  N_("Illegal object type for operation"),
+  N_("Passed object is not the same object on server"),
+  N_("Modify operation failed"),
+  N_("Query illegal for named table"),
+  N_("Attempt to remove a non-empty table"),
+  N_("Error in accessing NIS+ cold start file.  Is NIS+ installed?"),
+  N_("Full resync required for directory"),
+  N_("NIS+ operation failed"),
+  N_("NIS+ service is unavailable or not installed"),
+  N_("Yes, 42 is the meaning of life"),
+  N_("Unable to authenticate NIS+ server"),
+  N_("Unable to authenticate NIS+ client"),
+  N_("No file space on server"),
+  N_("Unable to create process on server"),
+  N_("Master server busy, full dump rescheduled.")
+};
 
 const char *
 nis_sperrno (const nis_error status)
 {
-  if (status >= sizeof (msgidx) / sizeof (msgidx[0]))
+  if (status >= (sizeof (nis_errlist) / sizeof (nis_errlist[0])))
     return "???";
   else
-    return gettext (msgstr.str + msgidx[status]);
+    return gettext (nis_errlist[status]);
 }
 libnsl_hidden_def (nis_sperrno)
 
@@ -78,21 +102,26 @@ char *
 nis_sperror_r (const nis_error status, const char *label,
 	       char *buffer, size_t buflen)
 {
-  if (snprintf (buffer, buflen, "%s: %s", label, nis_sperrno (status))
-      >= buflen)
+  const char *cptr;
+
+  cptr = nis_sperrno (status);
+
+  if ((strlen (cptr) + strlen (label) + 3) > buflen)
     {
-      __set_errno (ERANGE);
+      errno = ERANGE;
       return NULL;
     }
 
-  return buffer;
+    sprintf (buffer, "%s: %s", label, cptr);
+
+    return buffer;
 }
 libnsl_hidden_def (nis_sperror_r)
 
 char *
 nis_sperror (const nis_error status, const char *label)
 {
-  static char buffer[NIS_MAXNAMELEN + 1];
+  static char buffer[NIS_MAXNAMELEN +1];
 
   return nis_sperror_r (status, label, buffer, sizeof (buffer));
 }