diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2006-06-03 01:13:44 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2006-06-03 01:13:44 +0000 |
| commit | fe7e9b5b69e42b92a1e0aac4faef8c1c9d21ac96 (patch) | |
| tree | 8915512f6b8b0c3b24f6bdb9f364d18bb78e71a1 | |
| parent | aae2d2d25d7423c99baadb724ff7722cafdcf095 (diff) | |
Mark GreetUser (called from xdm) as _X_EXPORT. Make all other non-static
functions in libXdmGreet _X_INTERNAL.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | greeter/Login.c | 12 | ||||
| -rw-r--r-- | greeter/greet.c | 4 | ||||
| -rw-r--r-- | greeter/verify.c | 5 |
4 files changed, 24 insertions, 5 deletions
@@ -1,5 +1,13 @@ 2006-06-02 Alan Coopersmith <alan.coopersmith@sun.com> + * greeter/Login.c: + * greeter/greet.c: + * greeter/verify.c: + Mark GreetUser (called from xdm) as _X_EXPORT. + Make all other non-static functions in libXdmGreet _X_INTERNAL. + +2006-06-02 Alan Coopersmith <alan.coopersmith@sun.com> + * configure.ac: * dm.h: Replace old Imake-based SIGNALRETURNSINT with AC_TYPE_SIGNAL diff --git a/greeter/Login.c b/greeter/Login.c index 1c5bda3..390bbf7 100644 --- a/greeter/Login.c +++ b/greeter/Login.c @@ -1,4 +1,4 @@ -/* $XdotOrg: app/xdm/greeter/Login.c,v 1.5 2006/04/14 02:52:02 alanc Exp $ */ +/* $XdotOrg: app/xdm/greeter/Login.c,v 1.6 2006/06/03 00:05:24 alanc Exp $ */ /* $Xorg: Login.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* @@ -522,6 +522,7 @@ static void failTimeout (XtPointer client_data, XtIntervalId * id) EraseFail (w); } +_X_INTERNAL void DrawFail (Widget ctx) { @@ -596,6 +597,7 @@ RedrawFail (LoginWidget w) } } +_X_INTERNAL void ErrorMessage(Widget ctx, const char *message, Bool timeout) { @@ -623,6 +625,7 @@ ErrorMessage(Widget ctx, const char *message, Bool timeout) } } +_X_INTERNAL void ShowChangePasswdMessage(Widget ctx) { @@ -753,6 +756,7 @@ draw_it (LoginWidget w) } /* Returns 0 on success, -1 on failure */ +_X_INTERNAL int SetPrompt (Widget ctx, int promptNum, const char *message, loginPromptState state, Boolean minimumTime) @@ -842,7 +846,9 @@ SetPrompt (Widget ctx, int promptNum, const char *message, return 0; } -const char *GetPrompt(Widget ctx, int promptNum) +_X_INTERNAL +const char * +GetPrompt(Widget ctx, int promptNum) { LoginWidget w = (LoginWidget) ctx; @@ -851,6 +857,7 @@ const char *GetPrompt(Widget ctx, int promptNum) return CUR_PROMPT_TEXT(w,promptNum); } +_X_INTERNAL int SetValue(Widget ctx, int promptNum, char *value) { @@ -880,6 +887,7 @@ SetValue(Widget ctx, int promptNum, char *value) return 0; } +_X_INTERNAL const char * GetValue(Widget ctx, int promptNum) { diff --git a/greeter/greet.c b/greeter/greet.c index 7c4a1fd..7c12cfc 100644 --- a/greeter/greet.c +++ b/greeter/greet.c @@ -1,5 +1,5 @@ /* $Xorg: greet.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ -/* $XdotOrg: $ */ +/* $XdotOrg: app/xdm/greeter/greet.c,v 1.4 2006/06/03 00:05:24 alanc Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -420,7 +420,7 @@ FailedLogin (struct display *d, struct greet_info *greet) #endif } - +_X_EXPORT greet_user_rtn GreetUser( struct display *d, Display ** dpy, diff --git a/greeter/verify.c b/greeter/verify.c index 672237d..f158f99 100644 --- a/greeter/verify.c +++ b/greeter/verify.c @@ -1,5 +1,5 @@ /* $Xorg: verify.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ -/* $XdotOrg: app/xdm/greeter/verify.c,v 1.8 2006/04/14 20:17:31 alanc Exp $ */ +/* $XdotOrg: app/xdm/greeter/verify.c,v 1.9 2006/06/03 00:05:24 alanc Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -121,6 +121,7 @@ userEnv (struct display *d, int useSystemPath, char *user, char *home, char *she } #ifdef USE_BSDAUTH +_X_INTERNAL int Verify (struct display *d, struct greet_info *greet, struct verify_info *verify) { @@ -235,6 +236,7 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify) */ struct smp_user_info *userp = 0; +_X_INTERNAL int Verify (struct display *d, struct greet_info *greet, struct verify_info *verify) { @@ -321,6 +323,7 @@ smp_fail: } } #else /* !USE_BSDAUTH && !USESECUREWARE */ +_X_INTERNAL int Verify (struct display *d, struct greet_info *greet, struct verify_info *verify) { |