[136] in Moira
patches to moira header files for ANSI C compliance
daemon@ATHENA.MIT.EDU (Jonathan I. Kamens)
Mon Jul 16 00:32:22 1990
Date: Mon, 16 Jul 90 00:31:38 -0400
From: "Jonathan I. Kamens" <jik@pit-manager.MIT.EDU>
To: bug-moira@ATHENA.MIT.EDU
The following patches need to be applied to the moira sources for
better ANSI compliance in header files.
*** /source/athena/athena.lib/moira/ss/ss_internal.h Tue Sep 13 17:52:06 1988
--- /tmp/source/athena/athena.lib/moira/ss/ss_internal.h Sun Jul 15 20:25:42 1990
***************
*** 48,51 ****
extern char *malloc(), *realloc(), *calloc();
extern int exit();
! #endif _SS_INTERNAL
--- 48,51 ----
extern char *malloc(), *realloc(), *calloc();
extern int exit();
! #endif /* _SS_INTERNAL */
*** /source/athena/athena.lib/moira/rpc/mr_private.h Sat Mar 17 16:37:23 1990
--- /tmp/source/athena/athena.lib/moira/rpc/mr_private.h Sun Jul 15 20:25:46 1990
***************
*** 36,42 ****
#ifndef htonl
extern u_long htonl(), ntohl();
extern u_short htons(), ntohs();
! #endif htonl
--- 36,42 ----
#ifndef htonl
extern u_long htonl(), ntohl();
extern u_short htons(), ntohs();
! #endif /* htonl */
*** /source/athena/athena.lib/moira/include/moira_site.h Wed Apr 4 11:30:53 1990
--- /tmp/source/athena/athena.lib/moira/include/moira_site.h Sun Jul 15 20:25:48 1990
***************
*** 338,341 ****
#define MOIRA_MOTD_FILE "/etc/smsdown" /* make the server go to sleep */
! #endif _moira_site_ /* Do not add anything after this line. */
--- 338,341 ----
#define MOIRA_MOTD_FILE "/etc/smsdown" /* make the server go to sleep */
! #endif /* _moira_site_ */ /* Do not add anything after this line. */
*** /source/athena/athena.lib/moira/include/moira.h Sun Jul 15 17:25:44 1990
--- /tmp/source/athena/athena.lib/moira/include/moira.h Sun Jul 15 20:25:49 1990
***************
*** 87,93 ****
char *strsave(char *s);
char *strtrim(char *s);
char *canonicalize_hostname(char *s);
! #else !__STDC__
int mr_connect();
int mr_disconnect();
int mr_host();
--- 87,93 ----
char *strsave(char *s);
char *strtrim(char *s);
char *canonicalize_hostname(char *s);
! #else /* !__STDC__ */
int mr_connect();
int mr_disconnect();
int mr_host();
***************
*** 102,107 ****
char *strsave();
char *strtrim();
char *canonicalize_hostname();
! #endif __STDC__
! #endif _moira_h_ /* Do Not Add Anything after this line. */
--- 102,107 ----
char *strsave();
char *strtrim();
char *canonicalize_hostname();
! #endif /* __STDC__ */
! #endif /* _moira_h_ */ /* Do Not Add Anything after this line. */
*** /source/athena/athena.lib/moira/include/krb.h Tue Aug 8 17:55:57 1989
--- /tmp/source/athena/athena.lib/moira/include/krb.h Sun Jul 15 20:25:54 1990
***************
*** 114,121 ****
#define CL_GTGT_INIT_FILE "\\kerberos\\k_in_tkts"
#else
#define CL_GTGT_INIT_FILE "/etc/k_in_tkts"
! #endif PC
/* Parameters for rd_ap_req */
/* Maximum alloable clock skew in seconds */
#define CLOCK_SKEW 5*60
--- 114,121 ----
#define CL_GTGT_INIT_FILE "\\kerberos\\k_in_tkts"
#else
#define CL_GTGT_INIT_FILE "/etc/k_in_tkts"
! #endif /* PC */
/* Parameters for rd_ap_req */
/* Maximum alloable clock skew in seconds */
#define CLOCK_SKEW 5*60
***************
*** 176,183 ****
#else
#define TKT_FILE tkt_string()
#define TKT_ROOT "/tmp/tkt"
! #endif PC
/* Error codes returned from the KDC */
#define KDC_OK 0 /* Request OK */
#define KDC_NAME_EXP 1 /* Principal expired */
--- 176,183 ----
#else
#define TKT_FILE tkt_string()
#define TKT_ROOT "/tmp/tkt"
! #endif /* PC */
/* Error codes returned from the KDC */
#define KDC_OK 0 /* Request OK */
#define KDC_NAME_EXP 1 /* Principal expired */
***************
*** 337,344 ****
#ifndef PC
char *tkt_string();
! #endif PC
#ifdef OLDNAMES
#define krb_mk_req mk_ap_req
#define krb_rd_req rd_ap_req
--- 337,344 ----
#ifndef PC
char *tkt_string();
! #endif /* PC */
#ifdef OLDNAMES
#define krb_mk_req mk_ap_req
#define krb_rd_req rd_ap_req
***************
*** 359,366 ****
#define krb_get_phost get_phost
#define krb_get_krbhst get_krbhst
#define krb_get_lrealm get_krbrlm
! #endif OLDNAMES
/* Defines for krb_sendauth and krb_recvauth */
#define KOPT_DONT_MK_REQ 0x00000001 /* don't call krb_mk_req */
--- 359,366 ----
#define krb_get_phost get_phost
#define krb_get_krbhst get_krbhst
#define krb_get_lrealm get_krbrlm
! #endif /* OLDNAMES */
/* Defines for krb_sendauth and krb_recvauth */
#define KOPT_DONT_MK_REQ 0x00000001 /* don't call krb_mk_req */
***************
*** 375,380 ****
#ifdef ATHENA_COMPAT
#define KOPT_DO_OLDSTYLE 0x00000008 /* use the old-style protocol */
! #endif ATHENA_COMPAT
! #endif KRB_DEFS
--- 375,380 ----
#ifdef ATHENA_COMPAT
#define KOPT_DO_OLDSTYLE 0x00000008 /* use the old-style protocol */
! #endif /* ATHENA_COMPAT */
! #endif /* KRB_DEFS */
*** /source/athena/athena.lib/moira/include/kadm.h Tue Sep 26 09:15:38 1989
--- /tmp/source/athena/athena.lib/moira/include/kadm.h Sun Jul 15 20:25:57 1990
***************
*** 138,141 ****
typedef int sigtype;
#endif
! #endif KADM_DEFS
--- 138,141 ----
typedef int sigtype;
#endif
! #endif /* KADM_DEFS */
*** /source/athena/athena.lib/moira/include/gdb.h Sun Jul 31 18:26:43 1988
--- /tmp/source/athena/athena.lib/moira/include/gdb.h Sun Jul 15 20:25:59 1990
***************
*** 1405,1411 ****
#define start_db_query gdb_sdbq
#else
#define op_select_any op_select
! #endif DUMB_7_CHAR_LOADER
extern char *string_alloc();
extern int string_free();
--- 1405,1411 ----
#define start_db_query gdb_sdbq
#else
#define op_select_any op_select
! #endif /* DUMB_7_CHAR_LOADER */
extern char *string_alloc();
extern int string_free();
*** /source/athena/athena.lib/moira/include/des.h Tue Jan 17 16:27:07 1989
--- /tmp/source/athena/athena.lib/moira/include/des.h Sun Jul 15 20:26:01 1990
***************
*** 45,48 ****
#define des_cblock_print(x) des_cblock_print_file(x, stdout)
! #endif DES_DEFS
--- 45,48 ----
#define des_cblock_print(x) des_cblock_print_file(x, stdout)
! #endif /* DES_DEFS */
*** /source/athena/athena.lib/moira/include/afs/auth.h Tue Nov 28 17:49:33 1989
--- /tmp/source/athena/athena.lib/moira/include/afs/auth.h Sun Jul 15 20:26:06 1990
***************
*** 41,47 ****
#define KTC_NOENT 4 /* no such entry */
#endif
! #endif __AUTH_AFS_INCL_
/* End of prolog file auth.p.h. */
--- 41,47 ----
#define KTC_NOENT 4 /* no such entry */
#endif
! #endif /* __AUTH_AFS_INCL_ */
/* End of prolog file auth.p.h. */
*** /source/athena/athena.lib/moira/clients/userreg/files.h Tue Mar 13 12:59:18 1990
--- /tmp/source/athena/athena.lib/moira/clients/userreg/files.h Sun Jul 15 20:26:16 1990
***************
*** 27,30 ****
#define NOT_ALLOWED TEXT "/not_allowed"
#define IMPROPER_LOGIN TEXT "/improper_reg"
#define OFFER_ENROLL TEXT "/offer_enroll"
! #endif __SABER__
--- 27,30 ----
#define NOT_ALLOWED TEXT "/not_allowed"
#define IMPROPER_LOGIN TEXT "/improper_reg"
#define OFFER_ENROLL TEXT "/offer_enroll"
! #endif /* __SABER__ */
*** /source/athena/athena.lib/moira/clients/moira.70orig/globals.h Fri Jul 29 18:31:44 1988
--- /tmp/source/athena/athena.lib/moira/clients/moira.70orig/globals.h Sun Jul 15 20:26:22 1990
***************
*** 28,31 ****
program. */
extern char *program_name; /* The name of this instance of the program. */
! #endif _sms_client_globals_ /* Do Not Add Anything After This Line */
--- 28,31 ----
program. */
extern char *program_name; /* The name of this instance of the program. */
! #endif /* _sms_client_globals_ */ /* Do Not Add Anything After This Line */
*** /source/athena/athena.lib/moira/clients/moira.70orig/f_defs.h Wed Apr 4 11:15:09 1990
--- /tmp/source/athena/athena.lib/moira/clients/moira.70orig/f_defs.h Sun Jul 15 20:26:27 1990
***************
*** 191,196 ****
Bool YesNoQuestion(); /* Asks a user a yes no type question. */
Bool YesNoQuitQuestion(); /* Asks a user a yes - no - quit question. */
! #endif _f_defs_ /* Do Not Add Anything After This Line */
--- 191,196 ----
Bool YesNoQuestion(); /* Asks a user a yes no type question. */
Bool YesNoQuitQuestion(); /* Asks a user a yes - no - quit question. */
! #endif /* _f_defs_ */ /* Do Not Add Anything After This Line */
*** /source/athena/athena.lib/moira/clients/moira.70orig/defs.h Wed Feb 14 12:23:50 1990
--- /tmp/source/athena/athena.lib/moira/clients/moira.70orig/defs.h Sun Jul 15 20:26:29 1990
***************
*** 22,34 ****
#ifndef TRUE
#define TRUE 1
! #endif TRUE
#ifndef FALSE
#define FALSE 0
! #endif FALSE
/* Modification information is always printed in this format. */
#define MOD_FORMAT ("Last Modification by %s at %s with %s.")
--- 22,34 ----
#ifndef TRUE
#define TRUE 1
! #endif /* TRUE */
#ifndef FALSE
#define FALSE 0
! #endif /* FALSE */
/* Modification information is always printed in this format. */
#define MOD_FORMAT ("Last Modification by %s at %s with %s.")
***************
*** 67,70 ****
char * q_data;
};
! #endif _defs_header_ /* Do Not Add Anything After This Line */
--- 67,70 ----
char * q_data;
};
! #endif /* _defs_header_ */ /* Do Not Add Anything After This Line */
*** /source/athena/athena.lib/moira/clients/moira/globals.h Thu Apr 26 14:46:23 1990
--- /tmp/source/athena/athena.lib/moira/clients/moira/globals.h Sun Jul 15 20:26:31 1990
***************
*** 28,31 ****
program. */
extern char *program_name; /* The name of this instance of the program. */
! #endif _sms_client_globals_ /* Do Not Add Anything After This Line */
--- 28,31 ----
program. */
extern char *program_name; /* The name of this instance of the program. */
! #endif /* _sms_client_globals_ */ /* Do Not Add Anything After This Line */
*** /source/athena/athena.lib/moira/clients/moira/f_defs.h Thu Apr 26 14:46:22 1990
--- /tmp/source/athena/athena.lib/moira/clients/moira/f_defs.h Sun Jul 15 20:26:33 1990
***************
*** 191,196 ****
Bool YesNoQuestion(); /* Asks a user a yes no type question. */
Bool YesNoQuitQuestion(); /* Asks a user a yes - no - quit question. */
! #endif _f_defs_ /* Do Not Add Anything After This Line */
--- 191,196 ----
Bool YesNoQuestion(); /* Asks a user a yes no type question. */
Bool YesNoQuitQuestion(); /* Asks a user a yes - no - quit question. */
! #endif /* _f_defs_ */ /* Do Not Add Anything After This Line */
*** /source/athena/athena.lib/moira/clients/moira/defs.h Thu Apr 26 14:46:21 1990
--- /tmp/source/athena/athena.lib/moira/clients/moira/defs.h Sun Jul 15 20:26:34 1990
***************
*** 22,34 ****
#ifndef TRUE
#define TRUE 1
! #endif TRUE
#ifndef FALSE
#define FALSE 0
! #endif FALSE
/* Modification information is always printed in this format. */
#define MOD_FORMAT ("Last Modification by %s at %s with %s.")
--- 22,34 ----
#ifndef TRUE
#define TRUE 1
! #endif /* TRUE */
#ifndef FALSE
#define FALSE 0
! #endif /* FALSE */
/* Modification information is always printed in this format. */
#define MOD_FORMAT ("Last Modification by %s at %s with %s.")
***************
*** 67,70 ****
char * q_data;
};
! #endif _defs_header_ /* Do Not Add Anything After This Line */
--- 67,70 ----
char * q_data;
};
! #endif /* _defs_header_ */ /* Do Not Add Anything After This Line */
