RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

polish whitespace for portable files

This commit is contained in:
Damien Miller 2021-04-03 17:47:37 +11:00
parent 31d8d231eb
commit 57ed647ee0
25 changed files with 98 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
audit-bsm.c
View File

@ -183,15 +183,15 @@ getacna(char *auditstring, int len)
scf_value_t *value = NULL; scf_value_t *value = NULL;
int ret = 0; 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); handle = scf_handle_create(SCF_VERSION);
if (handle == NULL) if (handle == NULL)
return -2; /* The man page for getacna on Solaris 10 states return -2;
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.
*/
ret = scf_handle_bind(handle); ret = scf_handle_bind(handle);
if (ret == -1) 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)); (void) au_write(ad, AUToReturnFunc(typ, rc));
#ifdef BROKEN_BSM_API #ifdef BROKEN_BSM_API
/* The last argument is the event modifier flags. For /*
some seemingly undocumented reason it was added in * The last argument is the event modifier flags. For some seemingly
Solaris 11. */ * undocumented reason it was added in Solaris 11.
*/
rc = au_close(ad, AU_TO_WRITE, event_no, 0); rc = au_close(ad, AU_TO_WRITE, event_no, 0);
#else #else
rc = au_close(ad, AU_TO_WRITE, event_no); rc = au_close(ad, AU_TO_WRITE, event_no);

11
auth-krb5.c
View File

@ -163,17 +163,18 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
goto out; 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) if (problem)
goto out; goto out;
problem = krb5_cc_initialize(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache, problem = krb5_cc_initialize(authctxt->krb5_ctx,
authctxt->krb5_user); authctxt->krb5_fwd_ccache, authctxt->krb5_user);
if (problem) if (problem)
goto out; goto out;
problem= krb5_cc_store_cred(authctxt->krb5_ctx, authctxt->krb5_fwd_ccache, problem = krb5_cc_store_cred(authctxt->krb5_ctx,
&creds); authctxt->krb5_fwd_ccache, &creds);
if (problem) if (problem)
goto out; goto out;
#endif #endif

7
contrib/gnome-ssh-askpass1.c
View File

@ -137,9 +137,10 @@ passphrase_dialog(char *message)
gnome_dialog_close(GNOME_DIALOG(dialog)); gnome_dialog_close(GNOME_DIALOG(dialog));
return (result == 0 ? 0 : -1); 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 * At least one grab failed - ungrab what we got, and report the
fail. */ * failure to the user. Note that XGrabServer() cannot fail.
*/
nograbkb: nograbkb:
gdk_pointer_ungrab(GDK_CURRENT_TIME); gdk_pointer_ungrab(GDK_CURRENT_TIME);
nograb: nograb:

6
contrib/gnome-ssh-askpass2.c
View File

@ -68,10 +68,8 @@ report_failed_grab (GtkWidget *parent_window, const char *what)
GtkWidget *err; GtkWidget *err;
err = gtk_message_dialog_new(GTK_WINDOW(parent_window), 0, err = gtk_message_dialog_new(GTK_WINDOW(parent_window), 0,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
GTK_BUTTONS_CLOSE, "Could not grab %s. A malicious client may be eavesdropping "
"Could not grab %s. "
"A malicious client may be eavesdropping "
"on your session.", what); "on your session.", what);
gtk_window_set_position(GTK_WINDOW(err), GTK_WIN_POS_CENTER); gtk_window_set_position(GTK_WINDOW(err), GTK_WIN_POS_CENTER);