X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Finit.c;h=93d1db8b088b3780601d5251b63fb30d71a0e28e;hb=9180287b270f5256d9d4c0ada37851ca9a720e40;hp=09ab61c7ef50f9c7a64bc9df035bc05c9dc82cbd;hpb=67a9f57e67c3b2c147969c752532fd55eb99259c;p=deb_libnfs.git diff --git a/lib/init.c b/lib/init.c index 09ab61c..93d1db8 100644 --- a/lib/init.c +++ b/lib/init.c @@ -21,15 +21,18 @@ #ifdef WIN32 #include "win32_compat.h" -#else -#include -#endif/*WIN32*/ +#endif + #define _GNU_SOURCE #ifdef HAVE_UNISTD_H #include #endif +#ifdef HAVE_STRINGS_H +#include +#endif + #include #include #include @@ -54,7 +57,9 @@ struct rpc_context *rpc_init_context(void) memset(rpc, 0, sizeof(struct rpc_context)); rpc->magic = RPC_CONTEXT_MAGIC; - rpc->encodebuflen = 65536; + + /* Allow 1M of data (for writes) and some */ + rpc->encodebuflen = 1024 * 1024 + 4096; rpc->encodebuf = malloc(rpc->encodebuflen); if (rpc->encodebuf == NULL) { free(rpc); @@ -67,9 +72,17 @@ struct rpc_context *rpc_init_context(void) free(rpc); return NULL; } - rpc->xid = salt + time(NULL); + rpc->xid = salt + time(NULL) + getpid() << 16; salt += 0x01000000; rpc->fd = -1; + rpc->tcp_syncnt = RPC_PARAM_UNDEFINED; +#ifdef WIN32 + rpc->uid = 65534; + rpc->gid = 65534; +#else + rpc->uid = getuid(); + rpc->gid = getgid(); +#endif return rpc; } @@ -97,6 +110,24 @@ void rpc_set_auth(struct rpc_context *rpc, struct AUTH *auth) rpc->auth = auth; } +static void rpc_set_uid_gid(struct rpc_context *rpc, int uid, int gid) { + if (uid != rpc->uid || gid != rpc->gid) { + struct AUTH *auth = libnfs_authunix_create("libnfs", uid, gid, 0, NULL); + if (auth != NULL) { + rpc_set_auth(rpc, auth); + rpc->uid = uid; + rpc->gid = gid; + } + } +} + +void rpc_set_uid(struct rpc_context *rpc, int uid) { + rpc_set_uid_gid(rpc, uid, rpc->gid); +} + +void rpc_set_gid(struct rpc_context *rpc, int gid) { + rpc_set_uid_gid(rpc, rpc->uid, gid); +} void rpc_set_error(struct rpc_context *rpc, char *error_string, ...) {