krb5.git
17 years agoUse intermediate target to prevent parallel invocations of 'make includes' in lib...
Ken Raeburn [Sat, 20 Jan 2007 20:30:36 +0000 (20:30 +0000)]
Use intermediate target to prevent parallel invocations of 'make includes' in lib/krb4

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19099 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoUse move-if-changed and a timestamp file to avoid re-running commands and
Ken Raeburn [Sat, 20 Jan 2007 19:11:34 +0000 (19:11 +0000)]
Use move-if-changed and a timestamp file to avoid re-running commands and
updating krb5.h when there are no textual changes.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19098 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoDon't copy headers to .../include
Ken Raeburn [Sat, 20 Jan 2007 18:47:32 +0000 (18:47 +0000)]
Don't copy headers to .../include

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19097 dc483132-0cff-0310-8789-dd5450dbe970

17 years agomake depend
Ken Raeburn [Sat, 20 Jan 2007 18:44:55 +0000 (18:44 +0000)]
make depend

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19096 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoBuild krb5.h using the _err.h files from the error_tables directory, not
Ken Raeburn [Sat, 20 Jan 2007 18:42:06 +0000 (18:42 +0000)]
Build krb5.h using the _err.h files from the error_tables directory, not
additional copies of them.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19095 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoDon't explicitly include error table headers that are also in krb5.h
Ken Raeburn [Sat, 20 Jan 2007 18:32:03 +0000 (18:32 +0000)]
Don't explicitly include error table headers that are also in krb5.h

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19094 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoMark as C source for Emacs mode selection
Ken Raeburn [Sat, 20 Jan 2007 18:06:27 +0000 (18:06 +0000)]
Mark as C source for Emacs mode selection

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19093 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoMove osconf input file to include directory instead of keeping it in its own
Ken Raeburn [Sat, 20 Jan 2007 17:23:36 +0000 (17:23 +0000)]
Move osconf input file to include directory instead of keeping it in its own
subdirectory.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19092 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago* Makefile.in (osconf.h): Use move-if-changed script
Ken Raeburn [Sat, 20 Jan 2007 17:05:02 +0000 (17:05 +0000)]
* Makefile.in (osconf.h): Use move-if-changed script

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19091 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago* pre.in (MOVEIFCHANGED): New variable
Ken Raeburn [Sat, 20 Jan 2007 17:04:25 +0000 (17:04 +0000)]
* pre.in (MOVEIFCHANGED): New variable

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19090 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoRemove unused file
Ken Raeburn [Sat, 20 Jan 2007 16:56:32 +0000 (16:56 +0000)]
Remove unused file

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19089 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoRemove varargs.h paths, always use stdarg.h
Ken Raeburn [Sat, 20 Jan 2007 16:54:37 +0000 (16:54 +0000)]
Remove varargs.h paths, always use stdarg.h

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19088 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoInclude stdarg.h, and don't conditionalize declarations of functions with
Ken Raeburn [Sat, 20 Jan 2007 12:52:34 +0000 (12:52 +0000)]
Include stdarg.h, and don't conditionalize declarations of functions with
va_list arguments.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19087 dc483132-0cff-0310-8789-dd5450dbe970

17 years agomake depend
Ken Raeburn [Sat, 20 Jan 2007 12:33:00 +0000 (12:33 +0000)]
make depend

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19086 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoHandle function names immediately preceded by "*", like "*strdup"
Ken Raeburn [Sat, 20 Jan 2007 12:13:15 +0000 (12:13 +0000)]
Handle function names immediately preceded by "*", like "*strdup"
in k5-int.h+krb5.h.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19085 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoMark as C source for Emacs mode selection
Ken Raeburn [Sat, 20 Jan 2007 12:07:41 +0000 (12:07 +0000)]
Mark as C source for Emacs mode selection

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19084 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoDon't define KRB5_PRIVATE, since it's not tested any more
Ken Raeburn [Sat, 20 Jan 2007 12:05:22 +0000 (12:05 +0000)]
Don't define KRB5_PRIVATE, since it's not tested any more

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19083 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoMove all KRB5_PRIVATE declarations from krb5.h(in) to k5-int.h, and drop the
Ken Raeburn [Sat, 20 Jan 2007 11:33:36 +0000 (11:33 +0000)]
Move all KRB5_PRIVATE declarations from krb5.h(in) to k5-int.h, and drop the
KRB5_PRIVATE preprocessor test.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19082 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago* Makefile.in (private-and-public-decls): New target file, created from
Ken Raeburn [Sat, 20 Jan 2007 11:29:07 +0000 (11:29 +0000)]
* Makefile.in (private-and-public-decls): New target file, created from
k5-int.h and krb5.h.
(verify-calling-conventions-krb5): Use it instead of krb5.h.
(clean-unix): Get rid of it.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19081 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoInclude k5-int.h instead of krb5.h when 'private' functions are needed
Ken Raeburn [Sat, 20 Jan 2007 11:02:58 +0000 (11:02 +0000)]
Include k5-int.h instead of krb5.h when 'private' functions are needed

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19080 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago* pre.in (.et.h, .et.c): Use temporary files in the current directory with
Ken Raeburn [Sat, 20 Jan 2007 10:59:19 +0000 (10:59 +0000)]
* pre.in (.et.h, .et.c): Use temporary files in the current directory with
fixed names, instead of incorporating the shell pid.
* post.in (clean-unix): Delete the temporary files.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19079 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoKFW MSI installer corrections
Jeffrey Altman [Sat, 20 Jan 2007 05:50:41 +0000 (05:50 +0000)]
KFW MSI installer corrections

Add missing registry keys and values for
Network Identity Manager plug-ins.

Correct short names.

ticket: new
tags: pullup
component: windows

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19078 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoNIM - Context sensitive system tray menu and more
Jeffrey Altman [Sat, 20 Jan 2007 05:42:30 +0000 (05:42 +0000)]
NIM - Context sensitive system tray menu and more

  Adds context sensitive menus for renew and destroy
to the system tray menu.  Select either all identities
    or one of the identities with credentials.

Increases the API to 1.1.9 and adds a new interactive
callback mechanism.

ticket: new
component: windows

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19077 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoDelete t_cccursor on cleanup. Add t_cc and t_cccursor to dependencies
Ken Raeburn [Sat, 20 Jan 2007 04:49:02 +0000 (04:49 +0000)]
Delete t_cccursor on cleanup.  Add t_cc and t_cccursor to dependencies

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19076 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoAdd t_cccursor to UNIX tests
Ken Raeburn [Sat, 20 Jan 2007 04:45:20 +0000 (04:45 +0000)]
Add t_cccursor to UNIX tests

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19075 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoAdded KDC timesyncing support to the CCAPI ccache backend for CCAPI v5 and
Alexandra Ellwood [Thu, 18 Jan 2007 23:24:13 +0000 (23:24 +0000)]
Added KDC timesyncing support to the CCAPI ccache backend for CCAPI v5 and
later.  v5 is the first version of the CCAPI to support the kdc timesyncing
API.

ticket: 5403

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19071 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago In addition to setting the kpasswd port after
Jeffrey Altman [Thu, 18 Jan 2007 15:28:07 +0000 (15:28 +0000)]
In addition to setting the kpasswd port after
searching for kadmind host addresses we must also
set the socket type according to the request.

ticket: 5393
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19070 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoNIM Kerberos 5 Provider corrections
Jeffrey Altman [Thu, 18 Jan 2007 12:43:58 +0000 (12:43 +0000)]
NIM Kerberos 5 Provider corrections

When validating a Kerberos 5 principal name, the request
to the KDC should not request forwardable, renewable, or
proxiable options as these may be blocked by policy and
will result in the return of an error.

Always treat the Kerberos 5 principal name as valid
unless the KDC returns an error that clearly indicates that
the principal name does not exist.

Use a MEMORY: ccache for temporary storage instead of an
API: ccache.

Initialize pointer values with NULL instead of 0.

ticket: new
tags: pullup
component: windows

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19069 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoNIM Correct Visual Identity Expiration Status
Jeffrey Altman [Thu, 18 Jan 2007 12:39:06 +0000 (12:39 +0000)]
NIM Correct Visual Identity Expiration Status

The visual status for the identities in NIM 1.1 was based
upon the highest alert status of any credential that was
associated with the identity.  The correct behavior that is
now implemented is that the identity status should be based
solely upon the expiration state of the credentials obtained
by the identity provider.

For example, the Kerberos v5 identity provider will based the
identity expiration status on the initial TGT.  Service tickets
with short lifetimes that expire do not prevent the acquisition
of additional service tickets.  Therefore, the identity should
not be listed as expired.

ticket: new
tags: pullup
component: windows

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19068 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoNIM Kerberos v4 configuration dialog
Jeffrey Altman [Thu, 18 Jan 2007 12:33:47 +0000 (12:33 +0000)]
NIM Kerberos v4 configuration dialog

The Kerberos v4 options for individual identities
was never wired.  The controls were visible but they
did not do anything.  Implement them now for NIM 1.2.

ticket: new
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19067 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoNIM string tables
Jeffrey Altman [Thu, 18 Jan 2007 12:31:23 +0000 (12:31 +0000)]
NIM string tables

Update the string tables for NIM so that they are consistent.
Always use "Kerberos v5" or "Kerberos v4".  Refer to credentials
instead of tickets.  Do not abbreviate "Network Identity Manager".
Etc.

ticket: new
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19066 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago sendto_kdc.c: use of a variable index into a dynamically
Jeffrey Altman [Thu, 18 Jan 2007 11:35:33 +0000 (11:35 +0000)]
   sendto_kdc.c: use of a variable index into a dynamically
allocated array to determine the sizeof() an object makes
it unclear what type of object is involved.  It also requires
a runtime check instead of a compile time replacement.
Not to mention that it could lead to the evaluation of an
uninitialized variable as was done in this case.  Replace
sizeof(array index variable) with sizeof(type).

memset() the correct data structure.

ticket: 5394
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19065 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago* t_cccursor.c (do_chk): Reverse sense of test of do_chk_one return value
Ken Raeburn [Wed, 17 Jan 2007 00:01:56 +0000 (00:01 +0000)]
* t_cccursor.c (do_chk): Reverse sense of test of do_chk_one return value

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19064 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoFix typo in checked-in version
Ken Raeburn [Tue, 16 Jan 2007 23:29:46 +0000 (23:29 +0000)]
Fix typo in checked-in version

ticket: 5349

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19063 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago This commit adds two new functions, krb5_server_decrypt_ticket_keyblock
Jeffrey Altman [Tue, 16 Jan 2007 04:18:02 +0000 (04:18 +0000)]
  This commit adds two new functions, krb5_server_decrypt_ticket_keyblock
  (private) and krb5_server_decrypt_ticket_keytab (public).  These
  functions take a krb5_ticket as input and decrypt it using the provided
  key data.  The public function is useful for higher level application
  protocols such a TLS-KRB5 and AFS RX-KRB5 which exchange a service
  but do not use the AP-REQ/AP-REP messages.

  This commit also adds new functionality to kvno which permits kvno
  when provided a keytab as input to verify whether or not the keytab
  contains a key that can successfully decrypt the obtains service ticket.

ticket: 5349
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19062 dc483132-0cff-0310-8789-dd5450dbe970

17 years agokfw wix installer - memory overwrite error
Jeffrey Altman [Sun, 14 Jan 2007 08:04:46 +0000 (08:04 +0000)]
kfw wix installer - memory overwrite error

   The custom handler allocates a buffer that is smaller
than is required to hold the input.  Allocate the correct
  sized buffer.

ticket: new
tags: pullup
component: windows

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19061 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoUpdate to KFW NSIS installer
Jeffrey Altman [Sat, 13 Jan 2007 17:08:28 +0000 (17:08 +0000)]
Update to KFW NSIS installer

Update copyright date, samples directory, and shortcut
to NetIDMgr documentation

ticket: new
component: windows
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19060 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoupdated Windows README
Jeffrey Altman [Sat, 13 Jan 2007 17:04:44 +0000 (17:04 +0000)]
updated Windows README

Revise the readme text for Windows.  Remove references
to old beta SDKs.

ticket: new
tags: pullup
component: windows

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19059 dc483132-0cff-0310-8789-dd5450dbe970

17 years agokrb5-1.7-prerelease
Tom Yu [Thu, 11 Jan 2007 00:13:46 +0000 (00:13 +0000)]
krb5-1.7-prerelease

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19056 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoMITKRB5-SA-2006-003: mechglue argument handling too lax
Tom Yu [Tue, 9 Jan 2007 19:45:25 +0000 (19:45 +0000)]
MITKRB5-SA-2006-003: mechglue argument handling too lax

Fix mechglue argument checks so that output pointers are always
initialized regardless of whether the other arguments fail to validate
for some reason.  This avoids freeing of uninitialized pointers.

Initialize the gss_buffer_descs in ovsec_kadmd.c.

ticket: new
target_version: 1.6
tags: pullup
component: krb5-libs

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19043 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoMITKRB5-SA-2006-002: svctcp_destroy() can call uninitialized function pointer
Tom Yu [Tue, 9 Jan 2007 19:45:10 +0000 (19:45 +0000)]
MITKRB5-SA-2006-002: svctcp_destroy() can call uninitialized function pointer

Explicitly null out xprt->xp_auth when AUTH_GSSAPI is being used, so
that svctcp_destroy() will not call through an uninitialized function
pointer after code in svc_auth_gssapi.c has destroyed expired state
structures.  We can't unconditionally null it because the RPCSEC_GSS
implementation needs it to retrieve state.

ticket: new
target_version: 1.6
tags: pullup
component: krb5-libs

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19042 dc483132-0cff-0310-8789-dd5450dbe970

17 years agocreate KDC database directory
Ken Raeburn [Mon, 8 Jan 2007 22:51:23 +0000 (22:51 +0000)]
create KDC database directory

The default directory for the KDC database files doesn't exist after a
normal "make install".  Reported by Jeff Blaine.

* Makefile.in (INSTALLMKDIRS): Add var (really localstatedir) and var/krb5kdc
to directories to be created at "make install" time, even though it'll be
empty on most machines (since most probably aren't KDCs).

ticket: new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19039 dc483132-0cff-0310-8789-dd5450dbe970

17 years agocrash creating db2 database in non-existent directory
Ken Raeburn [Mon, 8 Jan 2007 22:41:01 +0000 (22:41 +0000)]
crash creating db2 database in non-existent directory

* kdb_db2.c (krb5_db2_db_create): If the creation of the first database file
fails, return the error, instead of attempting to create the second (and using
a null pointer as an input string in formatting a filename).

Reported by Jeff Blaine.

ticket: new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19038 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago* lib.in (clean-libs): Delete darwin.exports and hpux10.exports.
Ken Raeburn [Sat, 6 Jan 2007 08:30:46 +0000 (08:30 +0000)]
* lib.in (clean-libs): Delete darwin.exports and hpux10.exports.
* libnover.in (clean-libs): Use $(DYNOBJEXT) instead of $(SHLIBEXT) for
extension on object to delete.  Also delete darwin.exports and hpux10.exports.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19037 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoDocument what the kadmind ACL is for
Russ Allbery [Fri, 5 Jan 2007 21:42:38 +0000 (21:42 +0000)]
Document what the kadmind ACL is for

Add a sentence documenting the purpose of the kadmind ACL to the node
explaining how to create it.

Ticket: 5279
Component: krb5-doc
Version_Reported: 1.5.1
Target_Version: 1.6
Tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19036 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoDocument KDC behavior without stash file
Russ Allbery [Thu, 4 Jan 2007 22:32:41 +0000 (22:32 +0000)]
Document KDC behavior without stash file

After the discussion of the optional stash file, document the effects of
not creating a stash file.

ticket: new
Component: krb5-doc
Version_Reported: 1.5.1
Target_Version: 1.6
Tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19035 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago* ldap_principal.c (attributes_set): Swap first two elements
Ken Raeburn [Wed, 3 Jan 2007 23:54:25 +0000 (23:54 +0000)]
* ldap_principal.c (attributes_set): Swap first two elements

Also add comments indicating that this array and the KDB_*_ATTR macros
need to be in sync.

ticket: 5260

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19031 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoupdate ldap/Makefile.in for newer autoconf substitution requirements
Ken Raeburn [Wed, 3 Jan 2007 23:15:55 +0000 (23:15 +0000)]
update ldap/Makefile.in for newer autoconf substitution requirements

The other makefile.in files have had the makefile-fragment
substitution lines updated to not have "#" at the front, because some
recent versions of autoconf require that the @-pattern start at the
beginning of the line.  We missed plugins/kdb/ldap/Makefile.in at the
time.

Patch from Michael Calmer.

ticket: new
target_version: 1.6
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19030 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago* Makefile.in (install): Install kdb5_ldap_util.M. Based on patch from
Ken Raeburn [Wed, 3 Jan 2007 22:53:33 +0000 (22:53 +0000)]
* Makefile.in (install): Install kdb5_ldap_util.M.  Based on patch from
Michael Calmer.

ticket: 3906
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19029 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago* kdc_util.h (CONVERT_INTO_DB, CONVERT_OUTOF_DB): Unused macros deleted
Ken Raeburn [Tue, 2 Jan 2007 23:53:36 +0000 (23:53 +0000)]
* kdc_util.h (CONVERT_INTO_DB, CONVERT_OUTOF_DB): Unused macros deleted

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19025 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoMemory leak in tests/gssapi/t_imp_name.c
Ezra Peisach [Sun, 31 Dec 2006 18:10:27 +0000 (18:10 +0000)]
Memory leak in tests/gssapi/t_imp_name.c

Memory leak by not releasing name_oid from gss_display_name().
(conditional on GSSAPI_V2 being defined).

ticket:new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19024 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoRepair broken links in NetIdMgr Help
Jeffrey Altman [Sun, 31 Dec 2006 16:24:54 +0000 (16:24 +0000)]
Repair broken links in NetIdMgr Help

  A small number of links contained the wrong root directory.

ticket: new
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19023 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoIf gss_krb5int_unseal_token_v3() unwraps a message of length 0 - free
Ezra Peisach [Sat, 30 Dec 2006 06:09:25 +0000 (06:09 +0000)]
If gss_krb5int_unseal_token_v3() unwraps a message of length 0 - free
memory and return in message_buffer a NULL pointer for value.  This
is consistant with gss_release_buffer in the mechglue implementation in which
memory is only freed if the buffer length != 0.

ticket: 5233
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19022 dc483132-0cff-0310-8789-dd5450dbe970

17 years agomemory leak if defective header present in gss_krb5int_unseal_token_v3
Ezra Peisach [Sat, 30 Dec 2006 06:05:12 +0000 (06:05 +0000)]
memory leak if defective header present in gss_krb5int_unseal_token_v3

If after unsealing the message, the TOK_ID is not 05 04, free memory
before returning a defective token error.

ticket: new
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19021 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoFix typo in user-guide.texinfo
Russ Allbery [Thu, 28 Dec 2006 18:05:28 +0000 (18:05 +0000)]
Fix typo in user-guide.texinfo

Typo fix (network instead of netword).  Thanks, Matt Zagrabelny.

Ticket: new
Component: krb5-doc
Version_Reported: 1.4.4
Target_Version: 1.6
Tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19020 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago* copy_data.c (krb5_copy_data): Use krb5int_copy_data_contents
Ken Raeburn [Thu, 28 Dec 2006 02:05:20 +0000 (02:05 +0000)]
* copy_data.c (krb5_copy_data): Use krb5int_copy_data_contents

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19019 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago* cc_memory.c (krb5_mcc_next_cred): Use krb5int_copy_creds_contents
Ken Raeburn [Thu, 28 Dec 2006 02:01:12 +0000 (02:01 +0000)]
* cc_memory.c (krb5_mcc_next_cred): Use krb5int_copy_creds_contents

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19018 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago* lib/krb5/krb/copy_creds.c (krb5int_copy_creds_contents): New function, split
Ken Raeburn [Thu, 28 Dec 2006 01:51:02 +0000 (01:51 +0000)]
* lib/krb5/krb/copy_creds.c (krb5int_copy_creds_contents): New function, split
out from krb5_copy_creds.
(krb5_copy_creds): Call it.
* include/k5-int.h (krb5int_copy_creds_contents): Declare.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19017 dc483132-0cff-0310-8789-dd5450dbe970

17 years agocomment the various data structures
Ken Raeburn [Thu, 28 Dec 2006 01:36:49 +0000 (01:36 +0000)]
comment the various data structures

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19016 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoSome related changes were already in, and I found a couple more to make:
Ken Raeburn [Fri, 22 Dec 2006 01:26:59 +0000 (01:26 +0000)]
Some related changes were already in, and I found a couple more to make:

* ldap_realm.c (ldap_filter_correct): Change string argument to char *.  Delete
length argument, which was always strlen of the string argument, and compute
it locally, using size_t instead of (unsigned) int for length-related values.
Update all calls.

* ldap_realm.h (ldap_filter_correct): Updated declaration.

* ldap_misc.c (remove_overlapping_subtrees): Add forward declaration.  Make
static.
(is_principal_in_realm): Change local variable defrealmlen to size_t.
(store_tl_data): Change local variable curr to point to unsigned char, since
that's what the tl_data_contents array is declared as, and what the STORE16_INT
macro is happier with.
(krb5_ldap_get_reference_count): Make local variable i unsigned.

ticket: 4453
target_version: 1.6
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19009 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago * src/lib/krb5/krb/get_in_tkt.c (krb5_get_init_creds): Fix
Tom Yu [Fri, 22 Dec 2006 01:19:55 +0000 (01:19 +0000)]
* src/lib/krb5/krb/get_in_tkt.c (krb5_get_init_creds): Fix
ordering bug in previous patch.

ticket: 5123

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19007 dc483132-0cff-0310-8789-dd5450dbe970

17 years agodon't split HTML output from makeinfo
Tom Yu [Thu, 21 Dec 2006 21:58:10 +0000 (21:58 +0000)]
don't split HTML output from makeinfo

* doc/Makefile (HTML): To avoid generating excessively long
filenames, don't split HTML output.

ticket: new
target_version: 1.6
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19002 dc483132-0cff-0310-8789-dd5450dbe970

17 years agomisc cleanups in admin guide ldap sections
Ken Raeburn [Wed, 20 Dec 2006 21:40:20 +0000 (21:40 +0000)]
misc cleanups in admin guide ldap sections

There are a bunch of instances of incorrect punctuation, inconsistent
use of @-commands with option names, typos in names of principal
flags, and a couple spelling errors.  I only fixed what I noticed; I
haven't subjected the rest to careful review.

Also, the long section names for eDirectory-specific documentation
cause the tar files generated for snapshots (which include generated
html docs) to reach the 100-character limit for file names in
traditional tar format; GNU tar can create archives holding them, but
older tar implementations cannot read the archives properly.  So,
several eDirectory-related section names have been shortened.

ticket: new
target: 1.6
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19001 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoMerge r18962 to trunk, with minor tweaks; ready to merge to 1.6 branch
Ken Raeburn [Wed, 20 Dec 2006 21:12:35 +0000 (21:12 +0000)]
Merge r18962 to trunk, with minor tweaks; ready to merge to 1.6 branch

Changes fix up some sample names used, remove some options described
from certain commands, and fix filling in man pages.

ticket: 5116

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19000 dc483132-0cff-0310-8789-dd5450dbe970

17 years agouse KRB5KRB_ERR_GENERIC, not KRB_ERR_GENERIC in preauth2.c
Tom Yu [Tue, 19 Dec 2006 04:16:30 +0000 (04:16 +0000)]
use KRB5KRB_ERR_GENERIC, not KRB_ERR_GENERIC in preauth2.c

* src/lib/krb5/krb/preauth2.c (krb5_do_preauth_tryagain): Use
KRB5KRB_ERR_GENERIC, not KRB_ERR_GENERIC.

ticket: new
target_version: 1.6
tags: pullup
component: krb5-libs

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18977 dc483132-0cff-0310-8789-dd5450dbe970

17 years agodon't pass null pointer to krb5_do_preauth_tryagain()
Tom Yu [Tue, 19 Dec 2006 04:16:22 +0000 (04:16 +0000)]
don't pass null pointer to krb5_do_preauth_tryagain()

* src/lib/krb5/krb/get_in_tkt.c (krb5_get_init_creds): If
the error isn't PREAUTH_NEEDED and preauth_to_use is null, return
the error in err_reply, rather than attempting to pass a null
pointer to krb5_do_preauth_tryagain().

ticket: new
status: open
target_version: 1.6

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18976 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoktfns.c (krb5_kt_get_entry): If the supplied server principal has an empty
Ken Raeburn [Tue, 19 Dec 2006 01:31:11 +0000 (01:31 +0000)]
ktfns.c (krb5_kt_get_entry): If the supplied server principal has an empty
realm name, replace it with the default realm, in a private copy.

ticket: 5121
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18975 dc483132-0cff-0310-8789-dd5450dbe970

17 years agokrb5_is_referral_realm now takes a pointer to const krb5_data, since it doesn't
Ken Raeburn [Tue, 19 Dec 2006 01:28:32 +0000 (01:28 +0000)]
krb5_is_referral_realm now takes a pointer to const krb5_data, since it doesn't
modify it.

ticket: 5121
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18974 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoUse __extension__ if initializing by field name and using GCC in pre-C99 mode
Ken Raeburn [Tue, 19 Dec 2006 00:42:17 +0000 (00:42 +0000)]
Use __extension__ if initializing by field name and using GCC in pre-C99 mode

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18973 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago(k5_mutex_lock_update_stats) [!DEBUG_THREADS_STATS && __GNUC__]: Declare
Ken Raeburn [Tue, 19 Dec 2006 00:34:11 +0000 (00:34 +0000)]
(k5_mutex_lock_update_stats) [!DEBUG_THREADS_STATS && __GNUC__]: Declare
arguments with "unused" attribute.
(k5_pthread_mutex_lock) [DEBUG_THREADS && __GNUC__]: Use __extension__.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18972 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoexport krb5_get_init_creds_opt_set_change_password_prompt
Tom Yu [Tue, 19 Dec 2006 00:21:38 +0000 (00:21 +0000)]
export krb5_get_init_creds_opt_set_change_password_prompt

ticket: 5090

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18970 dc483132-0cff-0310-8789-dd5450dbe970

17 years agokrb5_rc_io_open_internal on error will call close(-1)
Ezra Peisach [Mon, 18 Dec 2006 11:26:59 +0000 (11:26 +0000)]
krb5_rc_io_open_internal on error will call close(-1)

If there is an error in opening the replay cache - memory is freed, but
close() is invoked with -1 (failure from open()).  While technically,
close() will return EBADF in such a case, and nothing bad will happen,
valgrind picks up on this and provides an error...

ticket: new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18961 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoInovke krb5_rc_close to shutdown cache - and check for memory leaks
Ezra Peisach [Mon, 18 Dec 2006 11:22:49 +0000 (11:22 +0000)]
Inovke krb5_rc_close to shutdown cache - and check for memory leaks

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18960 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoRestore inadvertently deleted section. Minor editorial changes
Tom Yu [Mon, 18 Dec 2006 03:40:15 +0000 (03:40 +0000)]
Restore inadvertently deleted section.  Minor editorial changes

ticket: 5027

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18957 dc483132-0cff-0310-8789-dd5450dbe970

17 years agopull up r18933 to trunk
Tom Yu [Mon, 18 Dec 2006 03:40:03 +0000 (03:40 +0000)]
pull up r18933 to trunk

 r18933@cathode-dark-space:  rsavitha | 2006-12-08 04:37:01 -0500
 ticket: new
 subject: admin guide changes for the LDAP backend
 Target_Version: 1.6
 Tags: pullup

 Added LDAP backend related information to the admin guide

ticket: 5027

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18956 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoAdd -clearpolicy to kadmin addprinc usage
Russ Allbery [Sat, 16 Dec 2006 02:08:40 +0000 (02:08 +0000)]
Add -clearpolicy to kadmin addprinc usage

Add -clearpolicy to the usage message returned by kadmin when one types
addprinc without any arguments.

ticket: new
Component: krb5-admin
Version_Reported: 1.4.4
Target_Version: 1.6
Tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18955 dc483132-0cff-0310-8789-dd5450dbe970

17 years agokrb5_get_init_creds_opt_set_change_password_prompt
Jeffrey Altman [Thu, 14 Dec 2006 23:33:53 +0000 (23:33 +0000)]
krb5_get_init_creds_opt_set_change_password_prompt

     krb5_get_init_creds_opt_set_change_password_prompt is a new
     gic option that permits the prompter code to be skipped
     when the password has expired.  This option is meant to
     be used by credential managers such as NetIDMgr and
     Kerberos.app that have their own built in password change
     dialogs.

     This patch adds the new function, exports it on Windows,
     and makes use of it within the Krb5 identity provider
     for NetIDMgr.

     The patch is written to ensure that no changes to the
     krb5_get_init_creds_opt structure are required and
     to ensure that the default behavior, prompting, is
     maintained.

     The export lists for UNIX and KFM must still be updated.

     The function prototype was committed as part of ticket 3642.

ticket: new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18954 dc483132-0cff-0310-8789-dd5450dbe970

17 years agomake depend
Ken Raeburn [Wed, 13 Dec 2006 04:26:31 +0000 (04:26 +0000)]
make depend

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18949 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoPull r18927 up to trunk, and tweak check for "history" principal name
Ken Raeburn [Wed, 13 Dec 2006 04:25:27 +0000 (04:25 +0000)]
Pull r18927 up to trunk, and tweak check for "history" principal name
to be a little more precise.

Ready for pullup to 1.6 branch; make depend should be run.

ticket: 5009
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18948 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoset AUTOCONF_HEADER
Ken Raeburn [Wed, 13 Dec 2006 03:44:05 +0000 (03:44 +0000)]
set AUTOCONF_HEADER

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18947 dc483132-0cff-0310-8789-dd5450dbe970

17 years agopull r18926 up to trunk; ready for pullup to 1.6 branch
Ken Raeburn [Wed, 13 Dec 2006 01:27:24 +0000 (01:27 +0000)]
pull r18926 up to trunk; ready for pullup to 1.6 branch

ticket: 5005

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18946 dc483132-0cff-0310-8789-dd5450dbe970

17 years agomake depend
Ken Raeburn [Tue, 12 Dec 2006 22:57:53 +0000 (22:57 +0000)]
make depend

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18942 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoa little more info on libpython loading issue
Ken Raeburn [Tue, 12 Dec 2006 22:56:00 +0000 (22:56 +0000)]
a little more info on libpython loading issue

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18941 dc483132-0cff-0310-8789-dd5450dbe970

17 years agomake depend
Ken Raeburn [Tue, 12 Dec 2006 22:55:13 +0000 (22:55 +0000)]
make depend

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18940 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoDon't leak padata when looping for krb5_do_preauth_tryagain()
Kevin Coffman [Fri, 8 Dec 2006 21:02:02 +0000 (21:02 +0000)]
Don't leak padata when looping for krb5_do_preauth_tryagain()

    * src/lib/krb5/krb/get_in_tkt.c: krb5_get_init_creds()

Free any existing request.padata at the top of the loop
calling krb5_do_preauth() and krb5_do_preauth_tryagain().

ticket: new
component: krb5-libs
Target_Version: 1.6
Tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18935 dc483132-0cff-0310-8789-dd5450dbe970

17 years agobuild the trunk on Windows (again)
Jeffrey Altman [Fri, 8 Dec 2006 00:28:59 +0000 (00:28 +0000)]
build the trunk on Windows (again)

This revision corrects a number of missing or extraneous
KRB5_CALLCONV symbols; exposes symbols for _WIN32;
   and avoids including headers that don't exist

ticket: new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18932 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago Undo revision 18930 which was not supposed to include this
Jeffrey Altman [Thu, 7 Dec 2006 22:13:50 +0000 (22:13 +0000)]
Undo revision 18930 which was not supposed to include this
        file.

ticket: 3642

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18931 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago Modifications to support the generation and embedding
Jeffrey Altman [Thu, 7 Dec 2006 21:56:20 +0000 (21:56 +0000)]
Modifications to support the generation and embedding
    of library manifests into generated EXEs and DLLs.
    Manifests are required for Windows XP and above when
    applications are built with Microsoft Visual Studio 2005
    (aka VS8) or above.

ticket: 3642
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18930 dc483132-0cff-0310-8789-dd5450dbe970

17 years agokrb5_cc_remove should work for the CCAPI
Alexandra Ellwood [Tue, 5 Dec 2006 23:21:56 +0000 (23:21 +0000)]
krb5_cc_remove should work for the CCAPI

Implemented a working krb5_cc_remove for the CCAPI cache type.  Added a
private support function krb5_creds_compare() which checks if two krb5_creds
are identical.  This function should be needed by implementations of
krb5_cc_remove for other ccache types.

ticket: new
owner: tlyu
target_version: 1.6
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18923 dc483132-0cff-0310-8789-dd5450dbe970

17 years agominor update to kdb5_util man page for LDAP plugin
Will Fiveash [Mon, 4 Dec 2006 22:06:13 +0000 (22:06 +0000)]
minor update to kdb5_util man page for LDAP plugin

I added some info to the kdb5_util man page regarding the LDAP plugin.

ticket: new
Target_Version: krb5-1.6
Tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18919 dc483132-0cff-0310-8789-dd5450dbe970

17 years agofix for kdb5_util load bug with dumps from a LDAP KDB
Will Fiveash [Mon, 4 Dec 2006 21:47:50 +0000 (21:47 +0000)]
fix for kdb5_util load bug with dumps from a LDAP KDB

I found a bug when I did a "kdb5_util load -update ldap-dump" where
ldap-dump was a dump done from a LDAP based KDB.  The issue is that this
sort of dump contains principal_dn data which is not the case for a db2
KDB dump.

ticket: new
Target_Version: krb5-1.6
Tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18918 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoMake clean in lib/krb5/os does not clean test objs
Ezra Peisach [Sun, 3 Dec 2006 13:53:32 +0000 (13:53 +0000)]
Make clean in lib/krb5/os does not clean test objs

make clean failed to remove t_locate_kdc.o

ticket: new
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18915 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoRemove unused prototype for krb5_find_config_files
Ezra Peisach [Sun, 3 Dec 2006 02:52:11 +0000 (02:52 +0000)]
Remove unused prototype for krb5_find_config_files

The prototype for krb5_find_config_files() no longer is necessary
as the function does not exist in the source tree anymore.

ticket: new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18914 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoupdate for krb5-1.6-beta1
Tom Yu [Fri, 1 Dec 2006 23:36:41 +0000 (23:36 +0000)]
update for krb5-1.6-beta1

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18904 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago * src/lib/krb5/ccache/cc_file.c: Adapted patch from Roland
Tom Yu [Fri, 1 Dec 2006 20:57:04 +0000 (20:57 +0000)]
* src/lib/krb5/ccache/cc_file.c: Adapted patch from Roland
Dowdeswell to avoid possible double-free conditions on certain
errors.

ticket: 4788
tags: pullup
target_version: 1.6
component: krb5-libs

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18897 dc483132-0cff-0310-8789-dd5450dbe970

17 years agosend a new request with the new padata returned by krb5_do_preauth_tryagain()
Kevin Coffman [Fri, 1 Dec 2006 19:36:38 +0000 (19:36 +0000)]
send a new request with the new padata returned by krb5_do_preauth_tryagain()

    Send another request containing the padata obtained from tryagain.

    * src/include/k5-int.h
    Update prototype

    * src/lib/krb5/krb/get_in_tkt.c
    Send pointer to the request.padata so krb5_do_preauth_tryagain()
    can update the request to be sent.

    * src/lib/krb5/krb/preauth2.c
    If a module returns modified padata, add it to the return_padata
    and return.

ticket: new
Component: krb5-libs
Target_Version: 1.6
Tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18896 dc483132-0cff-0310-8789-dd5450dbe970

17 years agoReturn edata from non-"PA_REQUIRED" preauth types
Kevin Coffman [Fri, 1 Dec 2006 19:18:26 +0000 (19:18 +0000)]
Return edata from non-"PA_REQUIRED" preauth types

    * src/kdc/kdc_preauth.c (check_padata)
    Return e-data from any failing preauth module.
    Save the e-data and return value from the first failing module.
    If a subsequent module marked as PA_REQUIRED fails, return
    its e-data and error instead.

    * src/kdc/kdc_preauth.c (load_preauth_plugins)
    Quiet compiler warning by setting pointer to NULL.

ticket: new
Target_Version: 1.6
tags: pullup
Component: krb5-kdc

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18895 dc483132-0cff-0310-8789-dd5450dbe970

17 years agobump minor versions due to API additions
Tom Yu [Fri, 1 Dec 2006 18:41:49 +0000 (18:41 +0000)]
bump minor versions due to API additions

ticket: 4689
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18894 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago * src/kadmin/dbutil/dump.c (load_db): Open the dumpfile as
Tom Yu [Fri, 1 Dec 2006 17:09:42 +0000 (17:09 +0000)]
* src/kadmin/dbutil/dump.c (load_db): Open the dumpfile as
read-only; we only get a shared lock, so no reason to open for
writing for the sake of getting a lock.

ticket: 3218

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18893 dc483132-0cff-0310-8789-dd5450dbe970

17 years ago * src/appl/telnet/libtelnet/kerberos5.c (kerberos5_send):
Tom Yu [Fri, 1 Dec 2006 16:40:46 +0000 (16:40 +0000)]
* src/appl/telnet/libtelnet/kerberos5.c (kerberos5_send):
Conditionalize debugging printfs.

ticket: 4941
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18892 dc483132-0cff-0310-8789-dd5450dbe970