Changeset 988 for vendor/current/source3/libsmb/smberr.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/libsmb/smberr.c (modified) (8 diffs)

vendor/current/source3/libsmb/smberr.c

@@ -41 +41 @@
 
 /* Dos Error Messages */
-err_code_struct dos_msgs[] = {
+static err_code_struct dos_msgs[] = {
   {"ERRbadfunc",ERRbadfunc,"Invalid function."},
   {"ERRbadfile",ERRbadfile,"File not found."},
@@ -80 +80 @@
 
 /* Server Error Messages */
-err_code_struct server_msgs[] = {
+static err_code_struct server_msgs[] = {
   {"ERRerror",1,"Non-specific error code."},
   {"ERRbadpw",2,"Bad password - name/password pair in a Tree Connect or Session Setup are invalid."},
@@ -116 +116 @@
 
 /* Hard Error Messages */
-err_code_struct hard_msgs[] = {
+static err_code_struct hard_msgs[] = {
   {"ERRnowrite",19,"Attempt to write on write-protected diskette."},
   {"ERRbadunit",20,"Unknown unit."},
@@ -138 +138 @@
 
 
-const struct
+static const struct
 {
   int code;
@@ -159 +159 @@
 return a SMB error name from a class and code
 ****************************************************************************/
-const char *smb_dos_err_name(uint8 e_class, uint16 num)
+const char *smb_dos_err_name(uint8_t e_class, uint16_t num)
 {
         char *result;
@@ -188 +188 @@
 const char *get_dos_error_msg(WERROR result)
 {
-        uint16 errnum;
+        uint16_t errnum;
 
         errnum = W_ERROR_V(result);
@@ -198 +198 @@
 return a SMB error class name as a string.
 ****************************************************************************/
-const char *smb_dos_err_class(uint8 e_class)
+const char *smb_dos_err_class(uint8_t e_class)
 {
         char *result;
@@ -215 +215 @@
 }
 
-/****************************************************************************
-return a SMB string from an SMB buffer
-****************************************************************************/
-char *smb_dos_errstr(char *inbuf)
-{
-        char *result;
-        int e_class = CVAL(inbuf,smb_rcls);
-        int num = SVAL(inbuf,smb_err);
-        int i,j;
-
-        for (i=0;err_classes[i].e_class;i++)
-                if (err_classes[i].code == e_class) {
-                        if (err_classes[i].err_msgs) {
-                                err_code_struct *err = err_classes[i].err_msgs;
-                                for (j=0;err[j].name;j++)
-                                        if (num == err[j].code) {
-                                                if (DEBUGLEVEL > 0)
-                                                        result = talloc_asprintf(
-                                                                talloc_tos(), "%s - %s (%s)",
-                                                                err_classes[i].e_class,
-                                                                err[j].name,err[j].message);
-                                                else
-                                                        result = talloc_asprintf(
-                                                                talloc_tos(), "%s - %s",
-                                                                err_classes[i].e_class,
-                                                                err[j].name);
-                                                goto done;
-                                        }
-                        }
-
-                        result = talloc_asprintf(talloc_tos(), "%s - %d",
-                                                 err_classes[i].e_class, num);
-                        goto done;
-                }
-
-        result = talloc_asprintf(talloc_tos(), "Error: Unknown error (%d,%d)",
-                                 e_class, num);
- done:
-        SMB_ASSERT(result != NULL);
-        return result;
-}
-
 /*****************************************************************************
 map a unix errno to a win32 error