diff options
Diffstat (limited to 'usr/src')
3 files changed, 15 insertions, 24 deletions
diff --git a/usr/src/cmd/krb5/kadmin/gui/KdcGui.java b/usr/src/cmd/krb5/kadmin/gui/KdcGui.java index 2212267578..f30132fa65 100644 --- a/usr/src/cmd/krb5/kadmin/gui/KdcGui.java +++ b/usr/src/cmd/krb5/kadmin/gui/KdcGui.java @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -22,7 +21,7 @@ /* * ident "%Z%%M% %I% %E% SMI" * - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -944,7 +943,7 @@ public class KdcGui extends Group { new Boolean(false)); if ((privs & PRIV_LIST) == 0) { showWarning( - getString("Unable to access lists;please use the Name field.")); + getString("Unable to access lists; please use the Name field.")); ((TextField)gui.PrListPattern.getBody()).requestFocus(); } } diff --git a/usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/RootDialog.java b/usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/RootDialog.java index 8034facfdd..257f00d8cc 100644 --- a/usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/RootDialog.java +++ b/usr/src/cmd/krb5/kadmin/gui/visualrt/sunsoft/jws/visual/rt/awt/RootDialog.java @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -22,8 +21,8 @@ /* * ident "%Z%%M% %I% %E% SMI" * - * Copyright (c) 2000 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ /* @@ -39,8 +38,6 @@ import sunsoft.jws.visual.rt.base.DesignerAccess; import sunsoft.jws.visual.rt.base.*; import java.awt.*; -// For overriden pack() hack -import java.awt.peer.ComponentPeer; public class RootDialog extends Dialog implements RootWindow { private RWHelper helper; @@ -86,15 +83,15 @@ public class RootDialog extends Dialog implements RootWindow { */ public void pack() { Component parent = getParent(); - ComponentPeer peer = getPeer(); + Boolean dis = isDisplayable(); - if (parent != null && parent.getPeer() == null) { + if (parent != null && parent.isDisplayable() == false) { parent.addNotify(); } - if (peer == null) { + if (dis.equals(false)) { addNotify(); } - + Dimension d = getPreferredSize(); Point p = getDialogLocation(d); @@ -102,7 +99,7 @@ public class RootDialog extends Dialog implements RootWindow { // the peer has been created. There is an AWT bug that screws // up the location of the dialog, so we // have to make this adjustment. - if (Global.isMotif() && (peer == null)) { + if (Global.isMotif() && dis.equals(false)) { p.x -= d.width/2; p.y -= d.height/2; } diff --git a/usr/src/lib/pam_modules/krb5/krb5_authenticate.c b/usr/src/lib/pam_modules/krb5/krb5_authenticate.c index 3f2d8a96e4..e0900af293 100644 --- a/usr/src/lib/pam_modules/krb5/krb5_authenticate.c +++ b/usr/src/lib/pam_modules/krb5/krb5_authenticate.c @@ -126,16 +126,11 @@ pam_sm_authenticate( (void) pam_get_item(pamh, PAM_USER, (void**) &user); - /* Prompt for user name if it is not already available */ - if (user == NULL || !user[0]) { + if (user == NULL || *user == '\0') { if (debug) syslog(LOG_DEBUG, "PAM-KRB5 (auth): user empty " "or null"); - if ((err = pam_get_user(pamh, &user, NULL)) != PAM_SUCCESS) - return (err); - - if (user == NULL || !user[0]) - return (PAM_USER_UNKNOWN); + return (PAM_USER_UNKNOWN); } /* make sure a password entry exists for this user */ |