diff options
| -rw-r--r-- | source3/include/includes.h | 4 | ||||
| -rw-r--r-- | source3/include/safe_string.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 7b4c8dbdff..3dbe6d1093 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1035,10 +1035,6 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); int vasprintf(char **ptr, const char *format, va_list ap); #endif -#if !defined(HAVE_BZERO) && defined(HAVE_MEMSET) -#define bzero(a,b) memset((a),'\0',(b)) -#endif - #ifdef REPLACE_GETPASS #define getpass(prompt) getsmbpass((prompt)) #endif diff --git a/source3/include/safe_string.h b/source3/include/safe_string.h index df3633d91d..9f908bc145 100644 --- a/source3/include/safe_string.h +++ b/source3/include/safe_string.h @@ -32,6 +32,11 @@ #endif /* bcopy */ #define bcopy(src,dest,size) __ERROR__XX__NEVER_USE_BCOPY___; +#ifdef bzero +#undef bzero +#endif /* bzero */ +#define bzero(dest,size) __ERROR__XX__NEVER_USE_BZERO_USE_MEMSET_INSTEAD___; + #ifdef strcpy #undef strcpy #endif /* strcpy */ |