mirror of git://anongit.mindrot.org/openssh.git
polish whitespace for portable files
This commit is contained in:
parent
31d8d231eb
commit
57ed647ee0
21
audit-bsm.c
21
audit-bsm.c
|
@ -183,15 +183,15 @@ getacna(char *auditstring, int len)
|
|||
scf_value_t *value = NULL;
|
||||
int ret = 0;
|
||||
|
||||
/*
|
||||
* The man page for getacna on Solaris 10 states we should return -2
|
||||
* in case of error and set errno to indicate the error. We don't
|
||||
* bother with errno here, though, since the only use of this function
|
||||
* below doesn't check for errors anyway.
|
||||
*/
|
||||
handle = scf_handle_create(SCF_VERSION);
|
||||
if (handle == NULL)
|
||||
return -2; /* The man page for getacna on Solaris 10 states
|
||||
we should return -2 in case of error and set
|
||||
errno to indicate the error. We don't bother
|
||||
with errno here, though, since the only use
|
||||
of this function below doesn't check for errors
|
||||
anyway.
|
||||
*/
|
||||
return -2;
|
||||
|
||||
ret = scf_handle_bind(handle);
|
||||
if (ret == -1)
|
||||
|
@ -280,9 +280,10 @@ bsm_audit_record(int typ, char *string, au_event_t event_no)
|
|||
(void) au_write(ad, AUToReturnFunc(typ, rc));
|
||||
|
||||
#ifdef BROKEN_BSM_API
|
||||
/* The last argument is the event modifier flags. For
|
||||
some seemingly undocumented reason it was added in
|
||||
Solaris 11. */
|
||||
/*
|
||||
* The last argument is the event modifier flags. For some seemingly
|
||||
* undocumented reason it was added in Solaris 11.
|
||||
*/
|
||||
rc = au_close(ad, AU_TO_WRITE, event_no, 0);
|
||||
#else
|
||||
rc = au_close(ad, AU_TO_WRITE, event_no);
|
||||
|
|
11
auth-krb5.c
11
auth-krb5.c
|
@ -163,17 +163,18 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
|
|||
goto out;
|
||||
}
|
||||
|
||||
problem = ssh_krb5_cc_gen(authctxt->krb5_ctx, &authctxt->krb5_fwd_ccache);
|
||||
problem = ssh_krb5_cc_gen(authctxt->krb5_ctx,
|
||||
&authctxt->krb5_fwd_ccache);
|
||||
if (problem)
|
||||
goto out;
|
||||
|
||||
problem = krb5_cc_initialize(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache,
|
||||
authctxt->krb5_user);
|
||||
problem = krb5_cc_initialize(authctxt->krb5_ctx,
|
||||
authctxt->krb5_fwd_ccache, authctxt->krb5_user);
|
||||
if (problem)
|
||||
goto out;
|
||||
|
||||
problem= krb5_cc_store_cred(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache,
|
||||
&creds);
|
||||
problem = krb5_cc_store_cred(authctxt->krb5_ctx,
|
||||
authctxt->krb5_fwd_ccache, &creds);
|
||||
if (problem)
|
||||
goto out;
|
||||
#endif
|
||||
|
|
|
@ -137,9 +137,10 @@ passphrase_dialog(char *message)
|
|||
gnome_dialog_close(GNOME_DIALOG(dialog));
|
||||
return (result == 0 ? 0 : -1);
|
||||
|
||||
/* At least one grab failed - ungrab what we got, and report
|
||||
the failure to the user. Note that XGrabServer() cannot
|
||||
fail. */
|
||||
/*
|
||||
* At least one grab failed - ungrab what we got, and report the
|
||||
* failure to the user. Note that XGrabServer() cannot fail.
|
||||
*/
|
||||
nograbkb:
|
||||
gdk_pointer_ungrab(GDK_CURRENT_TIME);
|
||||
nograb:
|
||||
|
|
|
@ -68,10 +68,8 @@ report_failed_grab (GtkWidget *parent_window, const char *what)
|
|||
GtkWidget *err;
|
||||
|
||||
err = gtk_message_dialog_new(GTK_WINDOW(parent_window), 0,
|
||||
GTK_MESSAGE_ERROR,
|
||||
GTK_BUTTONS_CLOSE,
|
||||
"Could not grab %s. "
|
||||
"A malicious client may be eavesdropping "
|
||||
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
|
||||
"Could not grab %s. A malicious client may be eavesdropping "
|
||||
"on your session.", what);
|
||||
gtk_window_set_position(GTK_WINDOW(err), GTK_WIN_POS_CENTER);
|
||||
|
||||
|
|
Loading…
Reference in New Issue