The branch, master has been updated
via b76ab511f7238820a4e6ac3a2ae17d103f2bf9b9 (commit)
via 722765213bcda1de93d2fe7d64b89c8b7a37f29e (commit)
via dea2e4690a188a5ff06c9df354befe65cbcb320c (commit)
from 64ee4458cf8c8fb1dec5334cebbe63cfb0045ada (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b76ab511f7238820a4e6ac3a2ae17d103f2bf9b9
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Jul 15 20:47:07 2009 +0200
s4:winbind: rename uint => uint32_t as uint isn't portable
metze
commit 722765213bcda1de93d2fe7d64b89c8b7a37f29e
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Jul 15 20:45:53 2009 +0200
s4:libnet: rename uint => uint32_t because uint is not portable
metze
commit dea2e4690a188a5ff06c9df354befe65cbcb320c
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Jul 15 20:43:23 2009 +0200
s4:heimdal_build: try to fix the build on Solaris
We need the definition of 'struct flock'.
metze
-----------------------------------------------------------------------
Summary of changes:
source4/heimdal_build/replace.c | 4 +---
source4/libnet/libnet_group.c | 2 +-
source4/libnet/libnet_group.h | 4 ++--
source4/libnet/libnet_user.c | 2 +-
source4/libnet/libnet_user.h | 4 ++--
source4/winbind/wb_cmd_list_users.c | 2 +-
6 files changed, 8 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/heimdal_build/replace.c b/source4/heimdal_build/replace.c
index ba43dd9..6842b11 100644
--- a/source4/heimdal_build/replace.c
+++ b/source4/heimdal_build/replace.c
@@ -21,11 +21,9 @@
*/
#include "config.h"
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
#include "err.h"
#include "roken.h"
+#include "system/filesys.h"
#ifndef HAVE_ERR
void err(int eval, const char *format, ...)
diff --git a/source4/libnet/libnet_group.c b/source4/libnet/libnet_group.c
index b066964..9e7abe8 100644
--- a/source4/libnet/libnet_group.c
+++ b/source4/libnet/libnet_group.c
@@ -484,7 +484,7 @@ struct composite_context *libnet_GroupList_send(struct
libnet_context *ctx,
/* store the arguments in the state structure */
s->ctx = ctx;
s->page_size = io->in.page_size;
- s->resume_index = (uint32_t)io->in.resume_index;
+ s->resume_index = io->in.resume_index;
s->domain_name = talloc_strdup(c, io->in.domain_name);
s->monitor_fn = monitor;
diff --git a/source4/libnet/libnet_group.h b/source4/libnet/libnet_group.h
index b80d344..8ac4743 100644
--- a/source4/libnet/libnet_group.h
+++ b/source4/libnet/libnet_group.h
@@ -58,11 +58,11 @@ struct libnet_GroupList {
struct {
const char *domain_name;
int page_size;
- uint resume_index;
+ uint32_t resume_index;
} in;
struct {
int count;
- uint resume_index;
+ uint32_t resume_index;
struct grouplist {
const char *sid;
diff --git a/source4/libnet/libnet_user.c b/source4/libnet/libnet_user.c
index 8606d08..dd4d501 100644
--- a/source4/libnet/libnet_user.c
+++ b/source4/libnet/libnet_user.c
@@ -945,7 +945,7 @@ struct composite_context* libnet_UserList_send(struct
libnet_context *ctx,
/* store the arguments in the state structure */
s->ctx = ctx;
s->page_size = r->in.page_size;
- s->resume_index = (uint32_t)r->in.resume_index;
+ s->resume_index = r->in.resume_index;
s->domain_name = talloc_strdup(c, r->in.domain_name);
s->monitor_fn = monitor;
diff --git a/source4/libnet/libnet_user.h b/source4/libnet/libnet_user.h
index 4aad654..8203d14 100644
--- a/source4/libnet/libnet_user.h
+++ b/source4/libnet/libnet_user.h
@@ -140,11 +140,11 @@ struct libnet_UserList {
struct {
const char *domain_name;
int page_size;
- uint resume_index;
+ uint32_t resume_index;
} in;
struct {
int count;
- uint resume_index;
+ uint32_t resume_index;
struct userlist {
const char *sid;
diff --git a/source4/winbind/wb_cmd_list_users.c
b/source4/winbind/wb_cmd_list_users.c
index f67f133..755d457 100644
--- a/source4/winbind/wb_cmd_list_users.c
+++ b/source4/winbind/wb_cmd_list_users.c
@@ -33,7 +33,7 @@ struct cmd_list_users_state {
struct wbsrv_domain *domain;
char *domain_name;
- uint resume_index;
+ uint32_t resume_index;
char *result;
};
--
Samba Shared Repository
