diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:46:31 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:51:37 -0800 |
| commit | f757db2d319ccc5f7034165046fb2bb58901afb1 (patch) | |
| tree | 7dc465febb3a802d3f0e8856fcda856b13b04c0a /include/rpc | |
| parent | 76c0c0ed99f74b8a5965be6e1c6a0c0e7a72513c (diff) | |
| parent | b71274eebd68b7c68ab95c856f8075bdf4524cd7 (diff) | |
Merge remote branch 'origin/master' into nptl_merge
Conflicts:
Rules.mak
libc/misc/sysvipc/msgq.c
test/Rules.mak
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'include/rpc')
| -rw-r--r-- | include/rpc/auth.h | 4 | ||||
| -rw-r--r-- | include/rpc/auth_des.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/rpc/auth.h b/include/rpc/auth.h index e8390c885..ee5396fc5 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -176,11 +176,13 @@ extern AUTH *authunix_create_default (void); libc_hidden_proto(authunix_create_default) extern AUTH *authnone_create (void) __THROW; libc_hidden_proto(authnone_create) +#if 0 extern AUTH *authdes_create (const char *__servername, u_int __window, struct sockaddr *__syncaddr, des_block *__ckey) __THROW; extern AUTH *authdes_pk_create (const char *, netobj *, u_int, struct sockaddr *, des_block *) __THROW; +#endif #define AUTH_NONE 0 /* no authentication */ @@ -192,6 +194,7 @@ extern AUTH *authdes_pk_create (const char *, netobj *, u_int, #define AUTH_DH AUTH_DES /* Diffie-Hellman (this is DES) */ #define AUTH_KERB 4 /* kerberos style */ +#if 0 /* * Netname manipulating functions * @@ -216,6 +219,7 @@ extern int key_gendes (des_block *); extern int key_setsecret (char *); extern int key_secretkey_is_set (void); extern int key_get_conv (char *, des_block *); +#endif /* * XDR an opaque authentication struct. diff --git a/include/rpc/auth_des.h b/include/rpc/auth_des.h index 7a6b8be8d..d51b7ce7c 100644 --- a/include/rpc/auth_des.h +++ b/include/rpc/auth_des.h @@ -24,6 +24,7 @@ __BEGIN_DECLS +#if 0 /* There are two kinds of "names": fullnames and nicknames */ enum authdes_namekind { @@ -47,6 +48,7 @@ struct authdes_cred struct authdes_fullname adc_fullname; uint32_t adc_nickname; }; +#endif /* A timeval replacement for !32bit platforms */ struct rpc_timeval @@ -55,6 +57,7 @@ struct rpc_timeval uint32_t tv_usec; /* Microseconds. */ }; +#if 0 /* A des authentication verifier */ struct authdes_verf { @@ -102,6 +105,7 @@ extern int getpublickey (__const char *__name, char *__key) __THROW; the key. */ extern int getsecretkey (__const char *__name, char *__key, __const char *__passwd) __THROW; +#endif extern int rtime (struct sockaddr_in *__addrp, struct rpc_timeval *__timep, struct rpc_timeval *__timeout) __THROW; |