summaryrefslogtreecommitdiff
path: root/source4/utils
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-02-10 05:09:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:38 -0500
commite82aad1ce39a6b7a2e51b9e2cb494d74ec70e158 (patch)
treeb66f04c223e55e435b6ba56f4f05d2bf03132a12 /source4/utils
parente3aae721a7d5c8130448d67feb3a9200e14393ac (diff)
downloadsamba-e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158.tar.gz
samba-e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158.tar.bz2
samba-e82aad1ce39a6b7a2e51b9e2cb494d74ec70e158.zip
r5298: - got rid of pstring.h from includes.h. This at least makes it a bit
less likely that anyone will use pstring for new code - got rid of winbind_client.h from includes.h. This one triggered a huge change, as winbind_client.h was including system/filesys.h and defining the old uint32 and uint16 types, as well as its own pstring and fstring. (This used to be commit 9db6c79e902ec538108d6b7d3324039aabe1704f)
Diffstat (limited to 'source4/utils')
-rw-r--r--source4/utils/net/net_password.c1
-rw-r--r--source4/utils/ntlm_auth.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/utils/net/net_password.c b/source4/utils/net/net_password.c
index 8828b960ee..773e18d661 100644
--- a/source4/utils/net/net_password.c
+++ b/source4/utils/net/net_password.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "utils/net/net.h"
#include "libnet/libnet.h"
+#include "system/filesys.h"
#include "system/passwd.h"
/*
diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c
index b5e3f3b3ea..3c46b0ca70 100644
--- a/source4/utils/ntlm_auth.c
+++ b/source4/utils/ntlm_auth.c
@@ -25,6 +25,7 @@
#include "includes.h"
#include "dynconfig.h"
#include "system/passwd.h"
+#include "system/filesys.h"
#include "lib/cmdline/popt_common.h"
#include "auth/auth.h"
#include "libcli/security/security.h"
@@ -145,7 +146,7 @@ static NTSTATUS local_pw_check_specified(const char *username,
const DATA_BLOB *challenge,
const DATA_BLOB *lm_response,
const DATA_BLOB *nt_response,
- uint32 flags,
+ uint32_t flags,
DATA_BLOB *lm_session_key,
DATA_BLOB *user_session_key,
char **error_string,
@@ -564,7 +565,7 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod
char *error_string = NULL;
DATA_BLOB lm_key;
DATA_BLOB user_session_key;
- uint32 flags = 0;
+ uint32_t flags = 0;
if (full_username && !username) {
fstring fstr_user;