Revert "Change strict allocate to default to true.

[samba.git] / source3 / modules / weird.c

diff --git a/source3/modules/weird.c b/source3/modules/weird.c
index e4809a64c4271c7a97bb195ac62105271aeeda65..5db8cdcecd126b91e674589892ff8858fbe2cc59 100644 (file)
--- a/source3/modules/weird.c
+++ b/source3/modules/weird.c
@@ -6,7 +6,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,19 +15,18 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 
 static struct {
        char from;
-       char *to;
+       const char *to;
        int len;
 } weird_table[] = {
-       {'q', CONST_DISCARD(char *, "^q^"), 3},
-       {'Q', CONST_DISCARD(char *, "^Q^"), 3},
+       {'q', "^q^", 3},
+       {'Q', "^Q^", 3},
        {0, NULL}
 };
 
@@ -125,7 +124,11 @@ static size_t weird_push(void *cd, const char **inbuf, size_t *inbytesleft,
 
 struct charset_functions weird_functions = {"WEIRD", weird_pull, weird_push};
 
+NTSTATUS charset_weird_init(void);
 NTSTATUS charset_weird_init(void)
 {
-       return smb_register_charset(&weird_functions);
+       if (!smb_register_charset(&weird_functions)) {
+               return NT_STATUS_INTERNAL_ERROR;
+       }
+       return NT_STATUS_OK;
 }