X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=1f71f45f94e23f2305d44915d87753dcc2ab1848;hb=eb3066c0522617c7c5212e0e1508e03c9a87e1e5;hp=b3440092078d57d12e5c37f94735645fa82b536d;hpb=7974c7b863e396a87e1479525a10db9b9cf93ca9;p=citadel.git diff --git a/webcit/webcit.h b/webcit/webcit.h index b34400920..1f71f45f9 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -123,6 +123,10 @@ extern char *ssl_cipher_list; #define TRACE syslog(LOG_DEBUG, "\033[3%dmCHECKPOINT: %s:%d\033[0m", ((__LINE__%6)+1), __FILE__, __LINE__) +#ifdef UNDEF_MEMCPY +#undef memcpy +#endif + #define SLEEPING 180 /* TCP connection timeout */ #define WEBCIT_TIMEOUT 900 /* WebCit session timeout */ #define PORT_NUM 2000 /* port number to listen on */ @@ -441,7 +445,7 @@ struct wcsession { StrBuf *wc_password; /* Password of current user */ StrBuf *httpauth_pass; /* only for GroupDAV sessions */ int axlevel; /* this user's access level */ - int is_aide; /* nonzero == this user is an Aide */ + int is_aide; /* nonzero == this user is an Admin */ int connected; /* nonzero == we are connected to Citadel */ int logged_in; /* nonzero == we are logged in */ int need_regi; /* This user needs to register. */