summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-11-03 23:34:24 +0000
committerJeremy Allison <jra@samba.org>2001-11-03 23:34:24 +0000
commitf8e2baf39eb864481dd48f61404136b325cd73c2 (patch)
tree01e73e826f6f817e7ef9dd044cd1cc919eb152d1 /source3/lib
parent69a59c5bbceb4ea5a766cf8e9a42392369142e91 (diff)
downloadsamba-f8e2baf39eb864481dd48f61404136b325cd73c2.tar.gz
samba-f8e2baf39eb864481dd48f61404136b325cd73c2.tar.bz2
samba-f8e2baf39eb864481dd48f61404136b325cd73c2.zip
Added NT_USER_TOKEN into server_info to fix extra groups problem.
Got "medieval on our ass" about const warnings (as many as I could :-). Jeremy. (This used to be commit ee5e7ca547eff016818ba5c43b8ea0c9fa69b808)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/xfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/xfile.c b/source3/lib/xfile.c
index 6e21aeca58..7fc519e451 100644
--- a/source3/lib/xfile.c
+++ b/source3/lib/xfile.c
@@ -163,7 +163,7 @@ int x_fwrite(const void *p, size_t size, size_t nmemb, XFILE *f)
continue;
}
- memcpy(f->buf + f->bufused, total+(char *)p, n);
+ memcpy(f->buf + f->bufused, total+(const char *)p, n);
f->bufused += n;
total += n;
}
@@ -173,7 +173,7 @@ int x_fwrite(const void *p, size_t size, size_t nmemb, XFILE *f)
if (f->buftype == X_IOLBF && f->bufused) {
int i;
for (i=size-1; i>=0; i--) {
- if (*(i+(char *)p) == '\n') {
+ if (*(i+(const char *)p) == '\n') {
x_fflush(f);
break;
}