123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990 |
- --- librpcsecgss-0.19.orig/include/rpcsecgss/rpc/auth.h 2009-07-29 18:24:50.000000000 +0200
- +++ librpcsecgss-0.19/include/rpcsecgss/rpc/auth.h 2014-05-19 15:33:04.338267038 +0200
- @@ -44,7 +44,6 @@
-
- #ifndef _RPC_AUTH_H
- #define _RPC_AUTH_H
- -#include <sys/cdefs.h>
-
- #define MAX_AUTH_BYTES 400
- #define MAXNETNAMELEN 255 /* maximum length of network user's name */
- @@ -84,9 +83,13 @@ union des_block {
- char c[8];
- };
- typedef union des_block des_block;
- -__BEGIN_DECLS
- -extern bool_t xdr_des_block __P((XDR *, des_block *));
- -__END_DECLS
- +#ifdef __cplusplus
- +extern "C" {
- +#endif
- +extern bool_t xdr_des_block (XDR *, des_block *);
- +#ifdef __cplusplus
- +}
- +#endif
-
- /*
- * Authentication info. Opaque to client.
- @@ -106,24 +109,24 @@ typedef struct __rpc_auth {
- struct opaque_auth ah_verf;
- union des_block ah_key;
- struct auth_ops {
- - void (*ah_nextverf) __P((struct __rpc_auth *));
- + void (*ah_nextverf) (struct __rpc_auth *);
- /* nextverf & serialize */
- - int (*ah_marshal) __P((struct __rpc_auth *, XDR *));
- + int (*ah_marshal) (struct __rpc_auth *, XDR *);
- /* validate verifier */
- - int (*ah_validate) __P((struct __rpc_auth *,
- - struct opaque_auth *));
- + int (*ah_validate) (struct __rpc_auth *,
- + struct opaque_auth *);
- /* refresh credentials */
- - int (*ah_refresh) __P((struct __rpc_auth *));
- + int (*ah_refresh) (struct __rpc_auth *);
- /* destroy this structure */
- - void (*ah_destroy) __P((struct __rpc_auth *));
- + void (*ah_destroy) (struct __rpc_auth *);
- /* prepare to refresh credentials by destroying gss context */
- - void (*ah_prep_refresh) __P((struct __rpc_auth *));
- + void (*ah_prep_refresh) (struct __rpc_auth *);
- /* returns number of retries remaining for this rpc session */
- - int (*ah_get_retries) __P((struct __rpc_auth *));
- + int (*ah_get_retries) (struct __rpc_auth *);
- /* encode data for wire */
- - int (*ah_wrap) __P((struct __rpc_auth *, XDR *, xdrproc_t, caddr_t));
- + int (*ah_wrap) (struct __rpc_auth *, XDR *, xdrproc_t, caddr_t);
- /* decode data for wire */
- - int (*ah_unwrap) __P((struct __rpc_auth *, XDR *, xdrproc_t, caddr_t));
- + int (*ah_unwrap) (struct __rpc_auth *, XDR *, xdrproc_t, caddr_t);
-
- } *ah_ops;
- caddr_t ah_private;
- @@ -210,15 +213,19 @@ int authany_unwrap(struct __rpc_auth *,
- * int len;
- * int *aup_gids;
- */
- -__BEGIN_DECLS
- +#ifdef __cplusplus
- +extern "C" {
- +#endif
- struct sockaddr_in;
- -extern AUTH *authunix_create __P((char *, int, int, int, int *));
- -extern AUTH *authunix_create_default __P((void));
- -extern AUTH *authnone_create __P((void));
- -extern AUTH *authdes_create __P((char *, u_int,
- - struct sockaddr_in *, des_block *));
- -extern bool_t xdr_opaque_auth __P((XDR *, struct opaque_auth *));
- -__END_DECLS
- +extern AUTH *authunix_create (char *, int, int, int, int *);
- +extern AUTH *authunix_create_default (void);
- +extern AUTH *authnone_create (void);
- +extern AUTH *authdes_create (char *, u_int,
- + struct sockaddr_in *, des_block *);
- +extern bool_t xdr_opaque_auth (XDR *, struct opaque_auth *);
- +#ifdef __cplusplus
- +}
- +#endif
-
- #define AUTH_NONE 0 /* no authentication */
- #define AUTH_NULL 0 /* backward compatibility */
|