svn commit: r205510 - in user/jmallett/octeon: . bin/ps bin/sh
cddl/contrib/opensolaris/cmd/zfs
cddl/contrib/opensolaris/lib/libzfs/common contrib/bind9
contrib/bind9/bin/named contrib/bind9/doc/ar...
Juli Mallett
jmallett at FreeBSD.org
Tue Mar 23 06:42:54 UTC 2010
Author: jmallett
Date: Tue Mar 23 06:42:52 2010
New Revision: 205510
URL: http://svn.freebsd.org/changeset/base/205510
Log:
Merge from head.
Added:
user/jmallett/octeon/crypto/openssl/engines/alpha.opt
- copied unchanged from r205505, head/crypto/openssl/engines/alpha.opt
user/jmallett/octeon/crypto/openssl/engines/ia64.opt
- copied unchanged from r205505, head/crypto/openssl/engines/ia64.opt
user/jmallett/octeon/crypto/openssl/ssl/t1_reneg.c
- copied unchanged from r205505, head/crypto/openssl/ssl/t1_reneg.c
user/jmallett/octeon/lib/libcompat/4.3/re_comp.c
- copied unchanged from r205505, head/lib/libcompat/4.3/re_comp.c
user/jmallett/octeon/lib/libz/Symbol.map
- copied unchanged from r205505, head/lib/libz/Symbol.map
user/jmallett/octeon/lib/libz/Versions.def
- copied unchanged from r205505, head/lib/libz/Versions.def
user/jmallett/octeon/lib/libz/contrib/
- copied from r205505, head/lib/libz/contrib/
user/jmallett/octeon/lib/libz/doc/
- copied from r205505, head/lib/libz/doc/
user/jmallett/octeon/lib/libz/gzclose.c
- copied unchanged from r205505, head/lib/libz/gzclose.c
user/jmallett/octeon/lib/libz/gzguts.h
- copied unchanged from r205505, head/lib/libz/gzguts.h
user/jmallett/octeon/lib/libz/gzlib.c
- copied unchanged from r205505, head/lib/libz/gzlib.c
user/jmallett/octeon/lib/libz/gzread.c
- copied unchanged from r205505, head/lib/libz/gzread.c
user/jmallett/octeon/lib/libz/gzwrite.c
- copied unchanged from r205505, head/lib/libz/gzwrite.c
user/jmallett/octeon/sys/arm/conf/LN2410SBC
- copied unchanged from r205505, head/sys/arm/conf/LN2410SBC
user/jmallett/octeon/sys/arm/s3c2xx0/
- copied from r205505, head/sys/arm/s3c2xx0/
user/jmallett/octeon/sys/dev/usb/controller/ohci_s3c24x0.c
- copied unchanged from r205505, head/sys/dev/usb/controller/ohci_s3c24x0.c
user/jmallett/octeon/sys/netinet/ipfw/dn_sched_prio.c
- copied unchanged from r205505, head/sys/netinet/ipfw/dn_sched_prio.c
user/jmallett/octeon/tools/regression/bin/sh/builtins/command11.0
- copied unchanged from r205505, head/tools/regression/bin/sh/builtins/command11.0
user/jmallett/octeon/tools/regression/bin/sh/errors/assignment-error1.0
- copied unchanged from r205505, head/tools/regression/bin/sh/errors/assignment-error1.0
user/jmallett/octeon/tools/regression/bin/sh/errors/redirection-error4.0
- copied unchanged from r205505, head/tools/regression/bin/sh/errors/redirection-error4.0
user/jmallett/octeon/tools/regression/bin/sh/errors/redirection-error5.0
- copied unchanged from r205505, head/tools/regression/bin/sh/errors/redirection-error5.0
user/jmallett/octeon/tools/regression/bin/sh/errors/redirection-error6.0
- copied unchanged from r205505, head/tools/regression/bin/sh/errors/redirection-error6.0
user/jmallett/octeon/tools/regression/bin/sh/expansion/cmdsubst2.0
- copied unchanged from r205505, head/tools/regression/bin/sh/expansion/cmdsubst2.0
user/jmallett/octeon/tools/regression/usr.bin/ncal/
- copied from r205505, head/tools/regression/usr.bin/ncal/
Deleted:
user/jmallett/octeon/crypto/openssl/apps/genpkey.c
user/jmallett/octeon/crypto/openssl/apps/pkey.c
user/jmallett/octeon/crypto/openssl/apps/pkeyparam.c
user/jmallett/octeon/crypto/openssl/apps/pkeyutl.c
user/jmallett/octeon/crypto/openssl/apps/ts.c
user/jmallett/octeon/crypto/openssl/apps/tsget
user/jmallett/octeon/crypto/openssl/crypto/aes/aes_x86core.c
user/jmallett/octeon/crypto/openssl/crypto/aes/asm/aes-armv4.pl
user/jmallett/octeon/crypto/openssl/crypto/aes/asm/aes-ppc.pl
user/jmallett/octeon/crypto/openssl/crypto/aes/asm/aes-s390x.pl
user/jmallett/octeon/crypto/openssl/crypto/aes/asm/aes-sparcv9.pl
user/jmallett/octeon/crypto/openssl/crypto/asn1/ameth_lib.c
user/jmallett/octeon/crypto/openssl/crypto/asn1/asn1_locl.h
user/jmallett/octeon/crypto/openssl/crypto/asn1/bio_asn1.c
user/jmallett/octeon/crypto/openssl/crypto/asn1/bio_ndef.c
user/jmallett/octeon/crypto/openssl/crypto/asn1/x_nx509.c
user/jmallett/octeon/crypto/openssl/crypto/bn/asm/alpha-mont.pl
user/jmallett/octeon/crypto/openssl/crypto/bn/asm/armv4-mont.pl
user/jmallett/octeon/crypto/openssl/crypto/bn/asm/mips3-mont.pl
user/jmallett/octeon/crypto/openssl/crypto/bn/asm/ppc-mont.pl
user/jmallett/octeon/crypto/openssl/crypto/bn/asm/ppc64-mont.pl
user/jmallett/octeon/crypto/openssl/crypto/bn/asm/s390x-mont.pl
user/jmallett/octeon/crypto/openssl/crypto/bn/asm/s390x.S
user/jmallett/octeon/crypto/openssl/crypto/bn/asm/sparcv9-mont.pl
user/jmallett/octeon/crypto/openssl/crypto/bn/asm/sparcv9a-mont.pl
user/jmallett/octeon/crypto/openssl/crypto/bn/asm/via-mont.pl
user/jmallett/octeon/crypto/openssl/crypto/bn/asm/x86-mont.pl
user/jmallett/octeon/crypto/openssl/crypto/camellia/asm/cmll-x86.pl
user/jmallett/octeon/crypto/openssl/crypto/camellia/asm/cmll-x86_64.pl
user/jmallett/octeon/crypto/openssl/crypto/ppccpuid.pl
user/jmallett/octeon/crypto/openssl/crypto/s390xcpuid.S
user/jmallett/octeon/crypto/openssl/crypto/sparcv9cap.c
user/jmallett/octeon/crypto/openssl/engines/axp.opt
user/jmallett/octeon/include/regexp.h
user/jmallett/octeon/lib/libcompat/4.3/regex.c
user/jmallett/octeon/lib/libcompat/regexp/
user/jmallett/octeon/lib/libz/algorithm.txt
user/jmallett/octeon/lib/libz/gzio.c
Modified:
user/jmallett/octeon/MAINTAINERS
user/jmallett/octeon/Makefile
user/jmallett/octeon/ObsoleteFiles.inc
user/jmallett/octeon/bin/ps/extern.h
user/jmallett/octeon/bin/ps/keyword.c
user/jmallett/octeon/bin/ps/print.c
user/jmallett/octeon/bin/ps/ps.1
user/jmallett/octeon/bin/sh/eval.c
user/jmallett/octeon/bin/sh/parser.c
user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h
user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h
user/jmallett/octeon/contrib/bind9/CHANGES
user/jmallett/octeon/contrib/bind9/bin/named/server.c
user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM-book.xml
user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch06.html
user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch07.html
user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch08.html
user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.ch09.html
user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.html
user/jmallett/octeon/contrib/bind9/doc/arm/Bv9ARM.pdf
user/jmallett/octeon/contrib/bind9/doc/arm/man.dig.html
user/jmallett/octeon/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
user/jmallett/octeon/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
user/jmallett/octeon/contrib/bind9/doc/arm/man.dnssec-keygen.html
user/jmallett/octeon/contrib/bind9/doc/arm/man.dnssec-signzone.html
user/jmallett/octeon/contrib/bind9/doc/arm/man.host.html
user/jmallett/octeon/contrib/bind9/doc/arm/man.named-checkconf.html
user/jmallett/octeon/contrib/bind9/doc/arm/man.named-checkzone.html
user/jmallett/octeon/contrib/bind9/doc/arm/man.named.html
user/jmallett/octeon/contrib/bind9/doc/arm/man.nsupdate.html
user/jmallett/octeon/contrib/bind9/doc/arm/man.rndc-confgen.html
user/jmallett/octeon/contrib/bind9/doc/arm/man.rndc.conf.html
user/jmallett/octeon/contrib/bind9/doc/arm/man.rndc.html
user/jmallett/octeon/contrib/bind9/lib/dns/api
user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/rdataset.h
user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/resolver.h
user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/result.h
user/jmallett/octeon/contrib/bind9/lib/dns/include/dns/validator.h
user/jmallett/octeon/contrib/bind9/lib/dns/ncache.c
user/jmallett/octeon/contrib/bind9/lib/dns/rbtdb.c
user/jmallett/octeon/contrib/bind9/lib/dns/rdatalist.c
user/jmallett/octeon/contrib/bind9/lib/dns/rdataset.c
user/jmallett/octeon/contrib/bind9/lib/dns/rdataslab.c
user/jmallett/octeon/contrib/bind9/lib/dns/resolver.c
user/jmallett/octeon/contrib/bind9/lib/dns/result.c
user/jmallett/octeon/contrib/bind9/lib/dns/sdb.c
user/jmallett/octeon/contrib/bind9/lib/dns/sdlz.c
user/jmallett/octeon/contrib/bind9/lib/dns/validator.c
user/jmallett/octeon/contrib/bind9/lib/dns/view.c
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_buffer.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_config.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_context.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gabn.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gethostent.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getipnode.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_gnba.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_hstrerror.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_inetntop.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_noop.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_packet.html
user/jmallett/octeon/contrib/bind9/lib/lwres/man/lwres_resutil.html
user/jmallett/octeon/contrib/bind9/version
user/jmallett/octeon/contrib/bsnmp/gensnmptree/gensnmptree.1
user/jmallett/octeon/contrib/bsnmp/snmpd/snmpmod.3
user/jmallett/octeon/contrib/openpam/include/security/pam_appl.h
user/jmallett/octeon/contrib/top/utils.c
user/jmallett/octeon/contrib/tzdata/antarctica
user/jmallett/octeon/contrib/tzdata/asia
user/jmallett/octeon/contrib/tzdata/australasia
user/jmallett/octeon/contrib/tzdata/zone.tab
user/jmallett/octeon/crypto/openssl/CHANGES
user/jmallett/octeon/crypto/openssl/Configure
user/jmallett/octeon/crypto/openssl/FAQ
user/jmallett/octeon/crypto/openssl/Makefile
user/jmallett/octeon/crypto/openssl/Makefile.org
user/jmallett/octeon/crypto/openssl/NEWS
user/jmallett/octeon/crypto/openssl/README
user/jmallett/octeon/crypto/openssl/apps/CA.sh
user/jmallett/octeon/crypto/openssl/apps/Makefile
user/jmallett/octeon/crypto/openssl/apps/apps.c
user/jmallett/octeon/crypto/openssl/apps/ca.c
user/jmallett/octeon/crypto/openssl/apps/dsa.c
user/jmallett/octeon/crypto/openssl/apps/dsaparam.c
user/jmallett/octeon/crypto/openssl/apps/enc.c
user/jmallett/octeon/crypto/openssl/apps/gendsa.c
user/jmallett/octeon/crypto/openssl/apps/genrsa.c
user/jmallett/octeon/crypto/openssl/apps/openssl.c
user/jmallett/octeon/crypto/openssl/apps/pkcs12.c
user/jmallett/octeon/crypto/openssl/apps/req.c
user/jmallett/octeon/crypto/openssl/apps/s_apps.h
user/jmallett/octeon/crypto/openssl/apps/s_cb.c
user/jmallett/octeon/crypto/openssl/apps/s_client.c
user/jmallett/octeon/crypto/openssl/apps/s_server.c
user/jmallett/octeon/crypto/openssl/apps/s_socket.c
user/jmallett/octeon/crypto/openssl/apps/speed.c
user/jmallett/octeon/crypto/openssl/apps/x509.c
user/jmallett/octeon/crypto/openssl/config
user/jmallett/octeon/crypto/openssl/crypto/aes/aes_cfb.c
user/jmallett/octeon/crypto/openssl/crypto/aes/asm/aes-x86_64.pl
user/jmallett/octeon/crypto/openssl/crypto/asn1/a_mbstr.c
user/jmallett/octeon/crypto/openssl/crypto/asn1/a_object.c
user/jmallett/octeon/crypto/openssl/crypto/asn1/asn1.h
user/jmallett/octeon/crypto/openssl/crypto/asn1/asn1_err.c
user/jmallett/octeon/crypto/openssl/crypto/asn1/asn1_gen.c
user/jmallett/octeon/crypto/openssl/crypto/asn1/asn1_par.c
user/jmallett/octeon/crypto/openssl/crypto/asn1/t_x509.c
user/jmallett/octeon/crypto/openssl/crypto/bio/bio.h
user/jmallett/octeon/crypto/openssl/crypto/bio/bss_dgram.c
user/jmallett/octeon/crypto/openssl/crypto/bio/bss_file.c
user/jmallett/octeon/crypto/openssl/crypto/bn/asm/x86_64-gcc.c
user/jmallett/octeon/crypto/openssl/crypto/bn/bn_div.c
user/jmallett/octeon/crypto/openssl/crypto/bn/bn_exp.c
user/jmallett/octeon/crypto/openssl/crypto/bn/bn_gf2m.c
user/jmallett/octeon/crypto/openssl/crypto/bn/bn_mul.c
user/jmallett/octeon/crypto/openssl/crypto/bn/bntest.c
user/jmallett/octeon/crypto/openssl/crypto/camellia/Makefile
user/jmallett/octeon/crypto/openssl/crypto/cast/c_cfb64.c
user/jmallett/octeon/crypto/openssl/crypto/cast/c_ecb.c
user/jmallett/octeon/crypto/openssl/crypto/cast/c_enc.c
user/jmallett/octeon/crypto/openssl/crypto/cast/c_ofb64.c
user/jmallett/octeon/crypto/openssl/crypto/cast/cast.h
user/jmallett/octeon/crypto/openssl/crypto/cms/cms_ess.c
user/jmallett/octeon/crypto/openssl/crypto/cms/cms_lib.c
user/jmallett/octeon/crypto/openssl/crypto/comp/c_zlib.c
user/jmallett/octeon/crypto/openssl/crypto/cryptlib.c
user/jmallett/octeon/crypto/openssl/crypto/dsa/Makefile
user/jmallett/octeon/crypto/openssl/crypto/dsa/dsa_asn1.c
user/jmallett/octeon/crypto/openssl/crypto/dsa/dsa_lib.c
user/jmallett/octeon/crypto/openssl/crypto/dso/dso_dlfcn.c
user/jmallett/octeon/crypto/openssl/crypto/ec/ec2_smpl.c
user/jmallett/octeon/crypto/openssl/crypto/ecdsa/Makefile
user/jmallett/octeon/crypto/openssl/crypto/ecdsa/ecs_ossl.c
user/jmallett/octeon/crypto/openssl/crypto/ecdsa/ecs_sign.c
user/jmallett/octeon/crypto/openssl/crypto/engine/Makefile
user/jmallett/octeon/crypto/openssl/crypto/engine/eng_cnf.c
user/jmallett/octeon/crypto/openssl/crypto/engine/eng_cryptodev.c
user/jmallett/octeon/crypto/openssl/crypto/engine/eng_ctrl.c
user/jmallett/octeon/crypto/openssl/crypto/engine/eng_err.c
user/jmallett/octeon/crypto/openssl/crypto/engine/eng_table.c
user/jmallett/octeon/crypto/openssl/crypto/engine/engine.h
user/jmallett/octeon/crypto/openssl/crypto/err/Makefile
user/jmallett/octeon/crypto/openssl/crypto/err/err_all.c
user/jmallett/octeon/crypto/openssl/crypto/evp/c_allc.c
user/jmallett/octeon/crypto/openssl/crypto/evp/c_alld.c
user/jmallett/octeon/crypto/openssl/crypto/evp/digest.c
user/jmallett/octeon/crypto/openssl/crypto/evp/evp_lib.c
user/jmallett/octeon/crypto/openssl/crypto/evp/evp_locl.h
user/jmallett/octeon/crypto/openssl/crypto/lhash/lhash.c
user/jmallett/octeon/crypto/openssl/crypto/md5/asm/md5-x86_64.pl
user/jmallett/octeon/crypto/openssl/crypto/o_init.c
user/jmallett/octeon/crypto/openssl/crypto/o_str.c
user/jmallett/octeon/crypto/openssl/crypto/objects/obj_dat.c
user/jmallett/octeon/crypto/openssl/crypto/objects/obj_dat.h
user/jmallett/octeon/crypto/openssl/crypto/objects/obj_mac.h
user/jmallett/octeon/crypto/openssl/crypto/objects/obj_mac.num
user/jmallett/octeon/crypto/openssl/crypto/objects/objects.txt
user/jmallett/octeon/crypto/openssl/crypto/ocsp/ocsp_prn.c
user/jmallett/octeon/crypto/openssl/crypto/opensslv.h
user/jmallett/octeon/crypto/openssl/crypto/pem/pem_seal.c
user/jmallett/octeon/crypto/openssl/crypto/perlasm/x86_64-xlate.pl
user/jmallett/octeon/crypto/openssl/crypto/pkcs12/p12_attr.c
user/jmallett/octeon/crypto/openssl/crypto/pkcs12/p12_key.c
user/jmallett/octeon/crypto/openssl/crypto/pkcs12/p12_utl.c
user/jmallett/octeon/crypto/openssl/crypto/pkcs12/pkcs12.h
user/jmallett/octeon/crypto/openssl/crypto/pkcs7/pk7_mime.c
user/jmallett/octeon/crypto/openssl/crypto/rand/rand_win.c
user/jmallett/octeon/crypto/openssl/crypto/rand/randfile.c
user/jmallett/octeon/crypto/openssl/crypto/rsa/rsa.h
user/jmallett/octeon/crypto/openssl/crypto/rsa/rsa_eay.c
user/jmallett/octeon/crypto/openssl/crypto/rsa/rsa_eng.c
user/jmallett/octeon/crypto/openssl/crypto/rsa/rsa_oaep.c
user/jmallett/octeon/crypto/openssl/crypto/rsa/rsa_pss.c
user/jmallett/octeon/crypto/openssl/crypto/rsa/rsa_sign.c
user/jmallett/octeon/crypto/openssl/crypto/sha/sha512.c
user/jmallett/octeon/crypto/openssl/crypto/stack/safestack.h
user/jmallett/octeon/crypto/openssl/crypto/symhacks.h
user/jmallett/octeon/crypto/openssl/crypto/ui/ui_openssl.c
user/jmallett/octeon/crypto/openssl/crypto/x509/by_dir.c
user/jmallett/octeon/crypto/openssl/crypto/x509/x509.h
user/jmallett/octeon/crypto/openssl/crypto/x509/x509_lu.c
user/jmallett/octeon/crypto/openssl/crypto/x509/x509_vfy.c
user/jmallett/octeon/crypto/openssl/crypto/x509/x509_vfy.h
user/jmallett/octeon/crypto/openssl/crypto/x509/x509_vpm.c
user/jmallett/octeon/crypto/openssl/crypto/x509v3/pcy_tree.c
user/jmallett/octeon/crypto/openssl/crypto/x509v3/v3_alt.c
user/jmallett/octeon/crypto/openssl/crypto/x509v3/v3_ocsp.c
user/jmallett/octeon/crypto/openssl/demos/x509/mkcert.c
user/jmallett/octeon/crypto/openssl/demos/x509/mkreq.c
user/jmallett/octeon/crypto/openssl/doc/apps/enc.pod
user/jmallett/octeon/crypto/openssl/doc/apps/verify.pod
user/jmallett/octeon/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod
user/jmallett/octeon/crypto/openssl/doc/crypto/EVP_DigestInit.pod
user/jmallett/octeon/crypto/openssl/doc/crypto/PKCS12_parse.pod
user/jmallett/octeon/crypto/openssl/doc/crypto/bn_internal.pod
user/jmallett/octeon/crypto/openssl/doc/crypto/d2i_X509.pod
user/jmallett/octeon/crypto/openssl/doc/crypto/d2i_X509_CRL.pod
user/jmallett/octeon/crypto/openssl/doc/crypto/d2i_X509_REQ.pod
user/jmallett/octeon/crypto/openssl/doc/crypto/hmac.pod
user/jmallett/octeon/crypto/openssl/doc/crypto/pem.pod
user/jmallett/octeon/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod
user/jmallett/octeon/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod
user/jmallett/octeon/crypto/openssl/engines/Makefile
user/jmallett/octeon/crypto/openssl/engines/e_capi.c
user/jmallett/octeon/crypto/openssl/engines/e_capi_err.c
user/jmallett/octeon/crypto/openssl/engines/e_capi_err.h
user/jmallett/octeon/crypto/openssl/engines/e_ubsec.c
user/jmallett/octeon/crypto/openssl/fips/Makefile
user/jmallett/octeon/crypto/openssl/fips/aes/fips_aesavs.c
user/jmallett/octeon/crypto/openssl/fips/des/fips_desmovs.c
user/jmallett/octeon/crypto/openssl/fips/dsa/fips_dsa_key.c
user/jmallett/octeon/crypto/openssl/fips/dsa/fips_dsa_sign.c
user/jmallett/octeon/crypto/openssl/fips/dsa/fips_dsatest.c
user/jmallett/octeon/crypto/openssl/fips/dsa/fips_dssvs.c
user/jmallett/octeon/crypto/openssl/fips/fips_locl.h
user/jmallett/octeon/crypto/openssl/fips/fips_test_suite.c
user/jmallett/octeon/crypto/openssl/fips/fips_utl.h
user/jmallett/octeon/crypto/openssl/fips/fipsalgtest.pl
user/jmallett/octeon/crypto/openssl/fips/fipsld
user/jmallett/octeon/crypto/openssl/fips/hmac/fips_hmac.c
user/jmallett/octeon/crypto/openssl/fips/hmac/fips_hmac_selftest.c
user/jmallett/octeon/crypto/openssl/fips/rand/fips_rand.c
user/jmallett/octeon/crypto/openssl/fips/rand/fips_rngvs.c
user/jmallett/octeon/crypto/openssl/fips/rsa/fips_rsagtest.c
user/jmallett/octeon/crypto/openssl/fips/rsa/fips_rsastest.c
user/jmallett/octeon/crypto/openssl/fips/rsa/fips_rsavtest.c
user/jmallett/octeon/crypto/openssl/fips/sha/Makefile
user/jmallett/octeon/crypto/openssl/fips/sha/fips_sha1_selftest.c
user/jmallett/octeon/crypto/openssl/openssl.spec
user/jmallett/octeon/crypto/openssl/ssl/Makefile
user/jmallett/octeon/crypto/openssl/ssl/d1_both.c
user/jmallett/octeon/crypto/openssl/ssl/d1_clnt.c
user/jmallett/octeon/crypto/openssl/ssl/d1_enc.c
user/jmallett/octeon/crypto/openssl/ssl/d1_lib.c
user/jmallett/octeon/crypto/openssl/ssl/d1_pkt.c
user/jmallett/octeon/crypto/openssl/ssl/d1_srvr.c
user/jmallett/octeon/crypto/openssl/ssl/dtls1.h
user/jmallett/octeon/crypto/openssl/ssl/kssl.c
user/jmallett/octeon/crypto/openssl/ssl/s23_clnt.c
user/jmallett/octeon/crypto/openssl/ssl/s23_srvr.c
user/jmallett/octeon/crypto/openssl/ssl/s2_srvr.c
user/jmallett/octeon/crypto/openssl/ssl/s3_both.c
user/jmallett/octeon/crypto/openssl/ssl/s3_clnt.c
user/jmallett/octeon/crypto/openssl/ssl/s3_lib.c
user/jmallett/octeon/crypto/openssl/ssl/s3_pkt.c
user/jmallett/octeon/crypto/openssl/ssl/s3_srvr.c
user/jmallett/octeon/crypto/openssl/ssl/ssl.h
user/jmallett/octeon/crypto/openssl/ssl/ssl3.h
user/jmallett/octeon/crypto/openssl/ssl/ssl_algs.c
user/jmallett/octeon/crypto/openssl/ssl/ssl_asn1.c
user/jmallett/octeon/crypto/openssl/ssl/ssl_cert.c
user/jmallett/octeon/crypto/openssl/ssl/ssl_ciph.c
user/jmallett/octeon/crypto/openssl/ssl/ssl_err.c
user/jmallett/octeon/crypto/openssl/ssl/ssl_lib.c
user/jmallett/octeon/crypto/openssl/ssl/ssl_locl.h
user/jmallett/octeon/crypto/openssl/ssl/ssl_rsa.c
user/jmallett/octeon/crypto/openssl/ssl/ssl_sess.c
user/jmallett/octeon/crypto/openssl/ssl/ssl_stat.c
user/jmallett/octeon/crypto/openssl/ssl/ssl_txt.c
user/jmallett/octeon/crypto/openssl/ssl/t1_enc.c
user/jmallett/octeon/crypto/openssl/ssl/t1_lib.c
user/jmallett/octeon/crypto/openssl/ssl/tls1.h
user/jmallett/octeon/crypto/openssl/test/Makefile
user/jmallett/octeon/crypto/openssl/test/cms-test.pl
user/jmallett/octeon/crypto/openssl/util/domd
user/jmallett/octeon/crypto/openssl/util/libeay.num
user/jmallett/octeon/crypto/openssl/util/mk1mf.pl
user/jmallett/octeon/crypto/openssl/util/mkdef.pl
user/jmallett/octeon/crypto/openssl/util/mkerr.pl
user/jmallett/octeon/crypto/openssl/util/pl/Mingw32.pl
user/jmallett/octeon/crypto/openssl/util/pl/VC-32.pl
user/jmallett/octeon/crypto/openssl/util/pod2man.pl
user/jmallett/octeon/crypto/openssl/util/shlib_wrap.sh
user/jmallett/octeon/etc/Makefile
user/jmallett/octeon/etc/rc.d/tmp
user/jmallett/octeon/games/pom/pom.6
user/jmallett/octeon/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h
user/jmallett/octeon/include/Makefile
user/jmallett/octeon/lib/Makefile
user/jmallett/octeon/lib/bind/config.h
user/jmallett/octeon/lib/csu/i386-elf/Makefile
user/jmallett/octeon/lib/libc/compat-43/sigpause.2
user/jmallett/octeon/lib/libc/gen/daemon.c
user/jmallett/octeon/lib/libc/gen/opendir.c
user/jmallett/octeon/lib/libc/sparc64/fpu/fpu.c
user/jmallett/octeon/lib/libc/sparc64/fpu/fpu_div.c
user/jmallett/octeon/lib/libc/sparc64/fpu/fpu_explode.c
user/jmallett/octeon/lib/libc/sparc64/fpu/fpu_extern.h
user/jmallett/octeon/lib/libc/sparc64/fpu/fpu_implode.c
user/jmallett/octeon/lib/libc/string/strlen.c
user/jmallett/octeon/lib/libc/sys/open.2
user/jmallett/octeon/lib/libcompat/4.1/ascftime.c
user/jmallett/octeon/lib/libcompat/4.1/cftime.c
user/jmallett/octeon/lib/libcompat/4.1/ftime.c
user/jmallett/octeon/lib/libcompat/4.1/getpw.c
user/jmallett/octeon/lib/libcompat/4.3/cfree.c
user/jmallett/octeon/lib/libcompat/4.3/re_comp.3
user/jmallett/octeon/lib/libcompat/Makefile
user/jmallett/octeon/lib/libgssapi/gss_init_sec_context.3
user/jmallett/octeon/lib/libgssapi/gss_unwrap.3
user/jmallett/octeon/lib/libkvm/kvm_getpcpu.3
user/jmallett/octeon/lib/librpcsec_gss/rpcsec_gss.3
user/jmallett/octeon/lib/libstand/bzipfs.c
user/jmallett/octeon/lib/libstand/gzipfs.c
user/jmallett/octeon/lib/libz/ChangeLog
user/jmallett/octeon/lib/libz/FAQ
user/jmallett/octeon/lib/libz/Makefile
user/jmallett/octeon/lib/libz/README
user/jmallett/octeon/lib/libz/adler32.c
user/jmallett/octeon/lib/libz/compress.c
user/jmallett/octeon/lib/libz/crc32.c
user/jmallett/octeon/lib/libz/deflate.c
user/jmallett/octeon/lib/libz/deflate.h
user/jmallett/octeon/lib/libz/example.c
user/jmallett/octeon/lib/libz/infback.c
user/jmallett/octeon/lib/libz/inffast.c
user/jmallett/octeon/lib/libz/inflate.c
user/jmallett/octeon/lib/libz/inflate.h
user/jmallett/octeon/lib/libz/inftrees.c
user/jmallett/octeon/lib/libz/inftrees.h
user/jmallett/octeon/lib/libz/minigzip.c (contents, props changed)
user/jmallett/octeon/lib/libz/trees.c
user/jmallett/octeon/lib/libz/uncompr.c
user/jmallett/octeon/lib/libz/zconf.h
user/jmallett/octeon/lib/libz/zlib.3
user/jmallett/octeon/lib/libz/zlib.h
user/jmallett/octeon/lib/libz/zutil.c
user/jmallett/octeon/lib/libz/zutil.h
user/jmallett/octeon/lib/msun/man/cimag.3
user/jmallett/octeon/libexec/tftpd/tftpd.8
user/jmallett/octeon/sbin/geom/class/multipath/geom_multipath.c
user/jmallett/octeon/sbin/ifconfig/ifconfig.c
user/jmallett/octeon/sbin/ipfw/dummynet.c
user/jmallett/octeon/sbin/ipfw/ipfw.8
user/jmallett/octeon/sbin/ipfw/ipfw2.c
user/jmallett/octeon/sbin/ipfw/ipfw2.h
user/jmallett/octeon/sbin/quotacheck/quotacheck.8
user/jmallett/octeon/sbin/sysctl/sysctl.c
user/jmallett/octeon/secure/lib/libcrypto/Makefile.inc
user/jmallett/octeon/secure/lib/libcrypto/Makefile.man
user/jmallett/octeon/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/ASN1_STRING_length.3
user/jmallett/octeon/secure/lib/libcrypto/man/ASN1_STRING_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
user/jmallett/octeon/secure/lib/libcrypto/man/ASN1_generate_nconf.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_ctrl.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_base64.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_buffer.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_cipher.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_md.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_null.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_ssl.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_find_type.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_push.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_read.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_accept.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_bio.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_connect.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_fd.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_file.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_mem.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_null.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_socket.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_set_callback.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_should_retry.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_BLINDING_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_CTX_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_CTX_start.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_add.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_add_word.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_bn2bin.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_cmp.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_copy.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_generate_prime.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_mod_inverse.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_num_bytes.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_rand.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_set_bit.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_swap.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_zero.3
user/jmallett/octeon/secure/lib/libcrypto/man/CONF_modules_free.3
user/jmallett/octeon/secure/lib/libcrypto/man/CONF_modules_load_file.3
user/jmallett/octeon/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3
user/jmallett/octeon/secure/lib/libcrypto/man/DH_generate_key.3
user/jmallett/octeon/secure/lib/libcrypto/man/DH_generate_parameters.3
user/jmallett/octeon/secure/lib/libcrypto/man/DH_get_ex_new_index.3
user/jmallett/octeon/secure/lib/libcrypto/man/DH_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/DH_set_method.3
user/jmallett/octeon/secure/lib/libcrypto/man/DH_size.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_SIG_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_do_sign.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_dup_DH.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_generate_key.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_generate_parameters.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_get_ex_new_index.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_set_method.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_sign.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_size.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_GET_LIB.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_clear_error.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_error_string.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_get_error.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_load_crypto_strings.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_load_strings.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_print_errors.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_put_error.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_remove_state.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_set_mark.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_BytesToKey.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_DigestInit.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_EncryptInit.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_OpenInit.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_PKEY_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_SealInit.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_SignInit.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_VerifyInit.3
user/jmallett/octeon/secure/lib/libcrypto/man/OBJ_nid2obj.3
user/jmallett/octeon/secure/lib/libcrypto/man/OPENSSL_Applink.3
user/jmallett/octeon/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
user/jmallett/octeon/secure/lib/libcrypto/man/OPENSSL_config.3
user/jmallett/octeon/secure/lib/libcrypto/man/OPENSSL_ia32cap.3
user/jmallett/octeon/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
user/jmallett/octeon/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
user/jmallett/octeon/secure/lib/libcrypto/man/PKCS12_create.3
user/jmallett/octeon/secure/lib/libcrypto/man/PKCS12_parse.3
user/jmallett/octeon/secure/lib/libcrypto/man/PKCS7_decrypt.3
user/jmallett/octeon/secure/lib/libcrypto/man/PKCS7_encrypt.3
user/jmallett/octeon/secure/lib/libcrypto/man/PKCS7_sign.3
user/jmallett/octeon/secure/lib/libcrypto/man/PKCS7_verify.3
user/jmallett/octeon/secure/lib/libcrypto/man/RAND_add.3
user/jmallett/octeon/secure/lib/libcrypto/man/RAND_bytes.3
user/jmallett/octeon/secure/lib/libcrypto/man/RAND_cleanup.3
user/jmallett/octeon/secure/lib/libcrypto/man/RAND_egd.3
user/jmallett/octeon/secure/lib/libcrypto/man/RAND_load_file.3
user/jmallett/octeon/secure/lib/libcrypto/man/RAND_set_rand_method.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_blinding_on.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_check_key.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_generate_key.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_get_ex_new_index.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_print.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_private_encrypt.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_public_encrypt.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_set_method.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_sign.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_size.3
user/jmallett/octeon/secure/lib/libcrypto/man/SMIME_read_PKCS7.3
user/jmallett/octeon/secure/lib/libcrypto/man/SMIME_write_PKCS7.3
user/jmallett/octeon/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
user/jmallett/octeon/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
user/jmallett/octeon/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
user/jmallett/octeon/secure/lib/libcrypto/man/X509_NAME_print_ex.3
user/jmallett/octeon/secure/lib/libcrypto/man/X509_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/bio.3
user/jmallett/octeon/secure/lib/libcrypto/man/blowfish.3
user/jmallett/octeon/secure/lib/libcrypto/man/bn.3
user/jmallett/octeon/secure/lib/libcrypto/man/bn_internal.3
user/jmallett/octeon/secure/lib/libcrypto/man/buffer.3
user/jmallett/octeon/secure/lib/libcrypto/man/crypto.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_DHparams.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_DSAPublicKey.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_RSAPublicKey.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509_ALGOR.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509_CRL.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509_NAME.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509_REQ.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509_SIG.3
user/jmallett/octeon/secure/lib/libcrypto/man/des.3
user/jmallett/octeon/secure/lib/libcrypto/man/dh.3
user/jmallett/octeon/secure/lib/libcrypto/man/dsa.3
user/jmallett/octeon/secure/lib/libcrypto/man/ecdsa.3
user/jmallett/octeon/secure/lib/libcrypto/man/engine.3
user/jmallett/octeon/secure/lib/libcrypto/man/err.3
user/jmallett/octeon/secure/lib/libcrypto/man/evp.3
user/jmallett/octeon/secure/lib/libcrypto/man/hmac.3
user/jmallett/octeon/secure/lib/libcrypto/man/lh_stats.3
user/jmallett/octeon/secure/lib/libcrypto/man/lhash.3
user/jmallett/octeon/secure/lib/libcrypto/man/md5.3
user/jmallett/octeon/secure/lib/libcrypto/man/mdc2.3
user/jmallett/octeon/secure/lib/libcrypto/man/pem.3
user/jmallett/octeon/secure/lib/libcrypto/man/rand.3
user/jmallett/octeon/secure/lib/libcrypto/man/rc4.3
user/jmallett/octeon/secure/lib/libcrypto/man/ripemd.3
user/jmallett/octeon/secure/lib/libcrypto/man/rsa.3
user/jmallett/octeon/secure/lib/libcrypto/man/sha.3
user/jmallett/octeon/secure/lib/libcrypto/man/threads.3
user/jmallett/octeon/secure/lib/libcrypto/man/ui.3
user/jmallett/octeon/secure/lib/libcrypto/man/ui_compat.3
user/jmallett/octeon/secure/lib/libcrypto/man/x509.3
user/jmallett/octeon/secure/lib/libssl/Makefile
user/jmallett/octeon/secure/lib/libssl/Makefile.man
user/jmallett/octeon/secure/lib/libssl/man/SSL_CIPHER_get_name.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_COMP_add_compression_method.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_add_session.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_ctrl.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_flush_sessions.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_free.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_new.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_sess_number.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_sessions.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_cert_store.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_info_callback.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_mode.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_options.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_timeout.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_verify.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_use_certificate.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_SESSION_free.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_SESSION_get_time.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_accept.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_alert_type_string.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_clear.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_connect.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_do_handshake.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_free.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_SSL_CTX.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_ciphers.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_client_CA_list.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_current_cipher.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_default_timeout.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_error.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_ex_new_index.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_fd.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_peer_cert_chain.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_peer_certificate.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_rbio.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_session.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_verify_result.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_version.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_library_init.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_load_client_CA_file.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_new.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_pending.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_read.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_rstate_string.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_session_reused.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_set_bio.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_set_connect_state.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_set_fd.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_set_session.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_set_shutdown.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_set_verify_result.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_shutdown.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_state_string.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_want.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_write.3
user/jmallett/octeon/secure/lib/libssl/man/d2i_SSL_SESSION.3
user/jmallett/octeon/secure/lib/libssl/man/ssl.3
user/jmallett/octeon/secure/usr.bin/openssl/man/CA.pl.1
user/jmallett/octeon/secure/usr.bin/openssl/man/asn1parse.1
user/jmallett/octeon/secure/usr.bin/openssl/man/ca.1
user/jmallett/octeon/secure/usr.bin/openssl/man/ciphers.1
user/jmallett/octeon/secure/usr.bin/openssl/man/crl.1
user/jmallett/octeon/secure/usr.bin/openssl/man/crl2pkcs7.1
user/jmallett/octeon/secure/usr.bin/openssl/man/dgst.1
user/jmallett/octeon/secure/usr.bin/openssl/man/dhparam.1
user/jmallett/octeon/secure/usr.bin/openssl/man/dsa.1
user/jmallett/octeon/secure/usr.bin/openssl/man/dsaparam.1
user/jmallett/octeon/secure/usr.bin/openssl/man/ec.1
user/jmallett/octeon/secure/usr.bin/openssl/man/ecparam.1
user/jmallett/octeon/secure/usr.bin/openssl/man/enc.1
user/jmallett/octeon/secure/usr.bin/openssl/man/errstr.1
user/jmallett/octeon/secure/usr.bin/openssl/man/gendsa.1
user/jmallett/octeon/secure/usr.bin/openssl/man/genrsa.1
user/jmallett/octeon/secure/usr.bin/openssl/man/nseq.1
user/jmallett/octeon/secure/usr.bin/openssl/man/ocsp.1
user/jmallett/octeon/secure/usr.bin/openssl/man/openssl.1
user/jmallett/octeon/secure/usr.bin/openssl/man/passwd.1
user/jmallett/octeon/secure/usr.bin/openssl/man/pkcs12.1
user/jmallett/octeon/secure/usr.bin/openssl/man/pkcs7.1
user/jmallett/octeon/secure/usr.bin/openssl/man/pkcs8.1
user/jmallett/octeon/secure/usr.bin/openssl/man/rand.1
user/jmallett/octeon/secure/usr.bin/openssl/man/req.1
user/jmallett/octeon/secure/usr.bin/openssl/man/rsa.1
user/jmallett/octeon/secure/usr.bin/openssl/man/rsautl.1
user/jmallett/octeon/secure/usr.bin/openssl/man/s_client.1
user/jmallett/octeon/secure/usr.bin/openssl/man/s_server.1
user/jmallett/octeon/secure/usr.bin/openssl/man/s_time.1
user/jmallett/octeon/secure/usr.bin/openssl/man/sess_id.1
user/jmallett/octeon/secure/usr.bin/openssl/man/smime.1
user/jmallett/octeon/secure/usr.bin/openssl/man/speed.1
user/jmallett/octeon/secure/usr.bin/openssl/man/spkac.1
user/jmallett/octeon/secure/usr.bin/openssl/man/verify.1
user/jmallett/octeon/secure/usr.bin/openssl/man/version.1
user/jmallett/octeon/secure/usr.bin/openssl/man/x509.1
user/jmallett/octeon/secure/usr.bin/openssl/man/x509v3_config.1
user/jmallett/octeon/share/dict/web2
user/jmallett/octeon/share/man/man4/acpi_wmi.4
user/jmallett/octeon/share/man/man4/altq.4
user/jmallett/octeon/share/man/man4/amdtemp.4
user/jmallett/octeon/share/man/man4/ath.4
user/jmallett/octeon/share/man/man4/cxgb.4
user/jmallett/octeon/share/man/man4/ddb.4
user/jmallett/octeon/share/man/man4/iscsi_initiator.4
user/jmallett/octeon/share/man/man4/ndis.4
user/jmallett/octeon/share/man/man4/sysmouse.4
user/jmallett/octeon/share/man/man4/textdump.4
user/jmallett/octeon/share/man/man4/uart.4
user/jmallett/octeon/share/man/man4/urio.4
user/jmallett/octeon/share/man/man9/fail.9
user/jmallett/octeon/share/man/man9/uio.9
user/jmallett/octeon/share/man/man9/vfs_mount.9
user/jmallett/octeon/share/misc/pci_vendors
user/jmallett/octeon/sys/amd64/acpica/acpi_machdep.c
user/jmallett/octeon/sys/amd64/amd64/mca.c
user/jmallett/octeon/sys/amd64/amd64/pmap.c
user/jmallett/octeon/sys/amd64/conf/GENERIC
user/jmallett/octeon/sys/amd64/conf/XENHVM
user/jmallett/octeon/sys/amd64/include/mca.h
user/jmallett/octeon/sys/amd64/include/specialreg.h
user/jmallett/octeon/sys/arm/arm/pmap.c
user/jmallett/octeon/sys/arm/conf/BWCT.hints
user/jmallett/octeon/sys/cam/scsi/scsi_sg.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
user/jmallett/octeon/sys/compat/freebsd32/freebsd32.h
user/jmallett/octeon/sys/compat/freebsd32/freebsd32_ipc.h
user/jmallett/octeon/sys/compat/freebsd32/freebsd32_misc.c
user/jmallett/octeon/sys/compat/freebsd32/freebsd32_proto.h
user/jmallett/octeon/sys/compat/freebsd32/freebsd32_syscall.h
user/jmallett/octeon/sys/compat/freebsd32/freebsd32_syscalls.c
user/jmallett/octeon/sys/compat/freebsd32/freebsd32_sysent.c
user/jmallett/octeon/sys/compat/freebsd32/freebsd32_util.h
user/jmallett/octeon/sys/compat/freebsd32/syscalls.master
user/jmallett/octeon/sys/compat/linux/linux_file.c
user/jmallett/octeon/sys/compat/x86bios/x86bios.c
user/jmallett/octeon/sys/conf/NOTES
user/jmallett/octeon/sys/conf/files
user/jmallett/octeon/sys/dev/aac/aac.c
user/jmallett/octeon/sys/dev/agp/agp_i810.c
user/jmallett/octeon/sys/dev/ahci/ahci.c
user/jmallett/octeon/sys/dev/ata/ata-raid.c
user/jmallett/octeon/sys/dev/bce/if_bce.c
user/jmallett/octeon/sys/dev/bce/if_bcefw.h
user/jmallett/octeon/sys/dev/bce/if_bcereg.h
user/jmallett/octeon/sys/dev/bwn/if_bwn.c
user/jmallett/octeon/sys/dev/drm/drm_pciids.h
user/jmallett/octeon/sys/dev/drm/i915_drv.h
user/jmallett/octeon/sys/dev/drm/i915_reg.h
user/jmallett/octeon/sys/dev/isp/isp_freebsd.c
user/jmallett/octeon/sys/dev/isp/isp_freebsd.h
user/jmallett/octeon/sys/dev/isp/isp_pci.c
user/jmallett/octeon/sys/dev/isp/isp_sbus.c
user/jmallett/octeon/sys/dev/mii/brgphy.c
user/jmallett/octeon/sys/dev/mii/brgphyreg.h
user/jmallett/octeon/sys/dev/mii/mii.c
user/jmallett/octeon/sys/dev/mii/miidevs
user/jmallett/octeon/sys/dev/msk/if_msk.c
user/jmallett/octeon/sys/dev/msk/if_mskreg.h
user/jmallett/octeon/sys/dev/mxge/if_mxge.c
user/jmallett/octeon/sys/dev/ofw/ofw_standard.c
user/jmallett/octeon/sys/dev/siis/siis.c
user/jmallett/octeon/sys/dev/sound/pci/hda/hdac.c
user/jmallett/octeon/sys/dev/usb/usbdevs
user/jmallett/octeon/sys/dev/usb/wlan/if_run.c
user/jmallett/octeon/sys/dev/usb/wlan/if_runreg.h
user/jmallett/octeon/sys/dev/usb/wlan/if_runvar.h
user/jmallett/octeon/sys/dev/xen/netback/netback.c
user/jmallett/octeon/sys/fs/fdescfs/fdesc_vnops.c
user/jmallett/octeon/sys/geom/gate/g_gate.c
user/jmallett/octeon/sys/geom/geom_dump.c
user/jmallett/octeon/sys/geom/multipath/g_multipath.c
user/jmallett/octeon/sys/i386/acpica/acpi_machdep.c
user/jmallett/octeon/sys/i386/conf/GENERIC
user/jmallett/octeon/sys/i386/conf/XEN
user/jmallett/octeon/sys/i386/i386/mca.c
user/jmallett/octeon/sys/i386/i386/pmap.c
user/jmallett/octeon/sys/i386/i386/trap.c
user/jmallett/octeon/sys/i386/include/mca.h
user/jmallett/octeon/sys/i386/include/specialreg.h
user/jmallett/octeon/sys/ia64/conf/GENERIC
user/jmallett/octeon/sys/ia64/ia64/clock.c
user/jmallett/octeon/sys/ia64/ia64/db_machdep.c
user/jmallett/octeon/sys/ia64/ia64/exception.S
user/jmallett/octeon/sys/ia64/ia64/highfp.c
user/jmallett/octeon/sys/ia64/ia64/interrupt.c
user/jmallett/octeon/sys/ia64/ia64/locore.S
user/jmallett/octeon/sys/ia64/ia64/machdep.c
user/jmallett/octeon/sys/ia64/ia64/mp_machdep.c
user/jmallett/octeon/sys/ia64/ia64/nexus.c
user/jmallett/octeon/sys/ia64/ia64/pmap.c
user/jmallett/octeon/sys/ia64/ia64/sal.c
user/jmallett/octeon/sys/ia64/include/clock.h
user/jmallett/octeon/sys/ia64/include/frame.h
user/jmallett/octeon/sys/ia64/include/intr.h
user/jmallett/octeon/sys/ia64/include/intrcnt.h
user/jmallett/octeon/sys/ia64/include/pcb.h
user/jmallett/octeon/sys/ia64/include/pcpu.h
user/jmallett/octeon/sys/ia64/include/smp.h
user/jmallett/octeon/sys/ia64/pci/pci_cfgreg.c
user/jmallett/octeon/sys/kern/kern_syscalls.c
user/jmallett/octeon/sys/kern/subr_eventhandler.c
user/jmallett/octeon/sys/kern/sysv_ipc.c
user/jmallett/octeon/sys/kern/sysv_msg.c
user/jmallett/octeon/sys/kern/sysv_sem.c
user/jmallett/octeon/sys/kern/sysv_shm.c
user/jmallett/octeon/sys/kern/uipc_mqueue.c
user/jmallett/octeon/sys/kern/uipc_sem.c
user/jmallett/octeon/sys/kern/uipc_syscalls.c
user/jmallett/octeon/sys/kern/vfs_aio.c
user/jmallett/octeon/sys/kern/vfs_syscalls.c
user/jmallett/octeon/sys/kern/vfs_vnops.c
user/jmallett/octeon/sys/mips/cavium/dev/rgmii/octeon_rgmx.c
user/jmallett/octeon/sys/mips/conf/AR71XX
user/jmallett/octeon/sys/mips/include/clock.h
user/jmallett/octeon/sys/mips/include/cpuregs.h
user/jmallett/octeon/sys/mips/include/db_machdep.h
user/jmallett/octeon/sys/mips/include/param.h
user/jmallett/octeon/sys/mips/include/pmap.h
user/jmallett/octeon/sys/mips/include/trap.h
user/jmallett/octeon/sys/mips/mips/db_trace.c
user/jmallett/octeon/sys/mips/mips/exception.S
user/jmallett/octeon/sys/mips/mips/mp_machdep.c
user/jmallett/octeon/sys/mips/mips/nexus.c
user/jmallett/octeon/sys/mips/mips/pmap.c
user/jmallett/octeon/sys/mips/mips/tick.c
user/jmallett/octeon/sys/mips/mips/trap.c
user/jmallett/octeon/sys/mips/mips/vm_machdep.c
user/jmallett/octeon/sys/mips/sibyte/sb_asm.S
user/jmallett/octeon/sys/mips/sibyte/sb_machdep.c
user/jmallett/octeon/sys/mips/sibyte/sb_scd.c
user/jmallett/octeon/sys/mips/sibyte/sb_scd.h
user/jmallett/octeon/sys/modules/zfs/Makefile
user/jmallett/octeon/sys/net/bpf.c
user/jmallett/octeon/sys/net/flowtable.c
user/jmallett/octeon/sys/net/flowtable.h
user/jmallett/octeon/sys/net/if.h
user/jmallett/octeon/sys/net/if_llatbl.c
user/jmallett/octeon/sys/net/if_llatbl.h
user/jmallett/octeon/sys/net/if_tap.c
user/jmallett/octeon/sys/net/if_tun.c
user/jmallett/octeon/sys/net/if_var.h
user/jmallett/octeon/sys/net/if_vlan.c
user/jmallett/octeon/sys/net/route.h
user/jmallett/octeon/sys/net/vnet.c
user/jmallett/octeon/sys/net/vnet.h
user/jmallett/octeon/sys/net80211/ieee80211_adhoc.c
user/jmallett/octeon/sys/net80211/ieee80211_ht.c
user/jmallett/octeon/sys/net80211/ieee80211_mesh.c
user/jmallett/octeon/sys/net80211/ieee80211_proto.c
user/jmallett/octeon/sys/net80211/ieee80211_sta.c
user/jmallett/octeon/sys/net80211/ieee80211_tdma.c
user/jmallett/octeon/sys/netgraph/ng_socket.c
user/jmallett/octeon/sys/netgraph/ng_socketvar.h
user/jmallett/octeon/sys/netinet/in_pcb.c
user/jmallett/octeon/sys/netinet/in_pcb.h
user/jmallett/octeon/sys/netinet/ip_divert.c
user/jmallett/octeon/sys/netinet/ip_fw.h
user/jmallett/octeon/sys/netinet/ip_input.c
user/jmallett/octeon/sys/netinet/ip_ipsec.c
user/jmallett/octeon/sys/netinet/ip_output.c
user/jmallett/octeon/sys/netinet/ipfw/dn_sched.h
user/jmallett/octeon/sys/netinet/ipfw/ip_dn_io.c
user/jmallett/octeon/sys/netinet/ipfw/ip_dn_private.h
user/jmallett/octeon/sys/netinet/ipfw/ip_dummynet.c
user/jmallett/octeon/sys/netinet/ipfw/ip_fw2.c
user/jmallett/octeon/sys/netinet/ipfw/ip_fw_dynamic.c
user/jmallett/octeon/sys/netinet/ipfw/ip_fw_log.c
user/jmallett/octeon/sys/netinet/ipfw/ip_fw_private.h
user/jmallett/octeon/sys/netinet/ipfw/ip_fw_table.c
user/jmallett/octeon/sys/netinet/ipfw/test/Makefile
user/jmallett/octeon/sys/netinet/raw_ip.c
user/jmallett/octeon/sys/netinet/sctp_crc32.c
user/jmallett/octeon/sys/netinet/sctp_crc32.h
user/jmallett/octeon/sys/netinet/sctp_indata.c
user/jmallett/octeon/sys/netinet/sctputil.c
user/jmallett/octeon/sys/netinet/sctputil.h
user/jmallett/octeon/sys/netinet/tcp_subr.c
user/jmallett/octeon/sys/netinet/tcp_timer.c
user/jmallett/octeon/sys/netinet/udp_usrreq.c
user/jmallett/octeon/sys/netinet6/ip6_output.c
user/jmallett/octeon/sys/pc98/conf/GENERIC
user/jmallett/octeon/sys/powerpc/aim/mmu_oea64.c
user/jmallett/octeon/sys/powerpc/aim/ofw_machdep.c
user/jmallett/octeon/sys/powerpc/booke/trap_subr.S
user/jmallett/octeon/sys/powerpc/conf/GENERIC
user/jmallett/octeon/sys/powerpc/ofw/ofw_real.c
user/jmallett/octeon/sys/powerpc/powermac/uninorth.c
user/jmallett/octeon/sys/sparc64/conf/GENERIC
user/jmallett/octeon/sys/sparc64/include/dcr.h
user/jmallett/octeon/sys/sparc64/include/tlb.h
user/jmallett/octeon/sys/sparc64/include/tte.h
user/jmallett/octeon/sys/sparc64/include/ver.h
user/jmallett/octeon/sys/sparc64/include/wstate.h
user/jmallett/octeon/sys/sparc64/pci/schizo.c
user/jmallett/octeon/sys/sparc64/pci/schizovar.h
user/jmallett/octeon/sys/sparc64/sparc64/cheetah.c
user/jmallett/octeon/sys/sparc64/sparc64/exception.S
user/jmallett/octeon/sys/sparc64/sparc64/genassym.c
user/jmallett/octeon/sys/sparc64/sparc64/locore.S
user/jmallett/octeon/sys/sparc64/sparc64/machdep.c
user/jmallett/octeon/sys/sparc64/sparc64/pmap.c
user/jmallett/octeon/sys/sparc64/sparc64/support.S
user/jmallett/octeon/sys/sparc64/sparc64/swtch.S
user/jmallett/octeon/sys/sun4v/conf/GENERIC
user/jmallett/octeon/sys/sys/eventhandler.h
user/jmallett/octeon/sys/sys/param.h
user/jmallett/octeon/sys/sys/pmc.h
user/jmallett/octeon/sys/sys/sysent.h
user/jmallett/octeon/sys/vm/uma_int.h
user/jmallett/octeon/tools/regression/aio/aiotest/aiotest.c
user/jmallett/octeon/tools/regression/mqueue/mqtest1/mqtest1.c
user/jmallett/octeon/tools/regression/mqueue/mqtest2/mqtest2.c
user/jmallett/octeon/tools/regression/mqueue/mqtest3/mqtest3.c
user/jmallett/octeon/tools/regression/mqueue/mqtest4/mqtest4.c
user/jmallett/octeon/tools/regression/mqueue/mqtest5/mqtest5.c
user/jmallett/octeon/tools/regression/posixsem/posixsem.c
user/jmallett/octeon/tools/regression/posixsem2/semtest.c
user/jmallett/octeon/tools/regression/usr.bin/Makefile
user/jmallett/octeon/usr.bin/biff/biff.1
user/jmallett/octeon/usr.bin/find/find.1
user/jmallett/octeon/usr.bin/minigzip/Makefile
user/jmallett/octeon/usr.bin/ncal/ncal.1
user/jmallett/octeon/usr.bin/ncal/ncal.c
user/jmallett/octeon/usr.bin/netstat/netgraph.c
user/jmallett/octeon/usr.bin/tar/bsdtar.1
user/jmallett/octeon/usr.bin/unifdef/unifdef.1
user/jmallett/octeon/usr.bin/unifdef/unifdef.c
user/jmallett/octeon/usr.bin/unifdef/unifdefall.sh
user/jmallett/octeon/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt
user/jmallett/octeon/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
user/jmallett/octeon/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def
user/jmallett/octeon/usr.sbin/freebsd-update/freebsd-update.8
user/jmallett/octeon/usr.sbin/jls/jls.c
user/jmallett/octeon/usr.sbin/lastlogin/lastlogin.c
user/jmallett/octeon/usr.sbin/mergemaster/mergemaster.8
user/jmallett/octeon/usr.sbin/mergemaster/mergemaster.sh
user/jmallett/octeon/usr.sbin/pkg_install/updating/pkg_updating.1
user/jmallett/octeon/usr.sbin/pmcannotate/pmcannotate.8
user/jmallett/octeon/usr.sbin/powerd/powerd.8
user/jmallett/octeon/usr.sbin/ppp/arp.c
user/jmallett/octeon/usr.sbin/uhsoctl/uhsoctl.1
user/jmallett/octeon/usr.sbin/zic/Makefile
Directory Properties:
user/jmallett/octeon/ (props changed)
user/jmallett/octeon/contrib/bind9/ (props changed)
user/jmallett/octeon/contrib/openpam/ (props changed)
user/jmallett/octeon/contrib/tzdata/ (props changed)
user/jmallett/octeon/crypto/openssl/ (props changed)
user/jmallett/octeon/lib/libz/ (props changed)
user/jmallett/octeon/sys/contrib/x86emu/ (props changed)
Modified: user/jmallett/octeon/MAINTAINERS
==============================================================================
--- user/jmallett/octeon/MAINTAINERS Tue Mar 23 06:19:44 2010 (r205509)
+++ user/jmallett/octeon/MAINTAINERS Tue Mar 23 06:42:52 2010 (r205510)
@@ -36,8 +36,6 @@ pci bus imp,jhb Pre-commit review reque
cdboot jhb Pre-commit review requested.
pxeboot jhb Pre-commit review requested.
witness jhb Pre-commit review requested.
-twe aradford at amcc.com Pre-commit review requested
-twa aradford at amcc.com Pre-commit review requested
CAM gibbs,
ken Pre-commit review requested. send to scsi at freebsd.org
devstat(9) ken Pre-commit review requested.
@@ -65,9 +63,6 @@ linprocfs des Advance notification reque
lpr gad Pre-commit review requested, particularly for
lpd/recvjob.c and lpd/printjob.c.
newsyslog(8) gad Heads-up appreciated. I'm going thru the PR's for it.
-pkill gad Heads-up appreciated.
-ps gad I am working on a number of changes to this. Would
- like advance notice of major changes planned to it.
cvs peter Heads-up appreciated, try not to break it.
nvi peter Try not to break it.
libz peter Try not to break it.
@@ -76,9 +71,6 @@ share/mk ru This is a vital component of
offer a pre-commit review for anything non-trivial.
ipfw ipfw Pre-commit review preferred. send to ipfw at freebsd.org
drm rnoland Just keep me informed of changes, try not to break it.
-libufs jmallett Willing to handle problems, help with work.
-fdc(4) joerg Just keep me informed of changes, try not to break it.
-sppp(4) joerg Just keep me informed of changes, try not to break it.
unifdef(1) fanf Pre-commit review requested.
ntp roberto Pre-commit review requested.
inetd dwmalone Recommends pre-commit review.
@@ -144,4 +136,3 @@ $ cd /usr/src; find */* -type f|xargs eg
sys/modules/3dfx/Makefile:MAINTAINER= cokane at FreeBSD.org
sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi <kzmi at ca2.so-net.ne.jp>
tools/tools/sysdoc/Makefile:MAINTAINER= trhodes at FreeBSD.org
-usr.sbin/zic/Makefile:MAINTAINER= wollman at FreeBSD.org
Modified: user/jmallett/octeon/Makefile
==============================================================================
--- user/jmallett/octeon/Makefile Tue Mar 23 06:19:44 2010 (r205509)
+++ user/jmallett/octeon/Makefile Tue Mar 23 06:42:52 2010 (r205510)
@@ -311,6 +311,7 @@ universe_${target}:
"check _.${target}.buildworld for details" | ${MAKEFAIL}))
@echo ">> ${target} buildworld completed on `LC_ALL=C date`"
.endif
+.if !defined(MAKE_JUST_WORLDS)
.if exists(${.CURDIR}/sys/${target}/conf/NOTES)
@(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \
${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
@@ -319,6 +320,7 @@ universe_${target}:
.endif
@cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \
universe_kernels
+.endif
@echo ">> ${target} completed on `LC_ALL=C date`"
.endfor
universe_kernels: universe_kernconfs
Modified: user/jmallett/octeon/ObsoleteFiles.inc
==============================================================================
--- user/jmallett/octeon/ObsoleteFiles.inc Tue Mar 23 06:19:44 2010 (r205509)
+++ user/jmallett/octeon/ObsoleteFiles.inc Tue Mar 23 06:42:52 2010 (r205510)
@@ -14,6 +14,15 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20100322: libz update
+OLD_LIBS+=lib/libz.so.5
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libz.so.5
+.endif
+# 20100314: removal of regexp.h
+OLD_FILES+=usr/include/regexp.h
+OLD_FILES+=usr/share/man/man3/regexp.3.gz
+OLD_FILES+=usr/share/man/man3/regsub.3.gz
# 20100303: actual removal of utmp.h
OLD_FILES+=usr/include/utmp.h
# 20100227: [ia64] removed <machine/sapicreg.h> and <machine/sapicvar.h>
Modified: user/jmallett/octeon/bin/ps/extern.h
==============================================================================
--- user/jmallett/octeon/bin/ps/extern.h Tue Mar 23 06:19:44 2010 (r205509)
+++ user/jmallett/octeon/bin/ps/extern.h Tue Mar 23 06:42:52 2010 (r205510)
@@ -48,6 +48,7 @@ void command(KINFO *, VARENT *);
void cputime(KINFO *, VARENT *);
int donlist(void);
void elapsed(KINFO *, VARENT *);
+void elapseds(KINFO *, VARENT *);
void emulname(KINFO *, VARENT *);
VARENT *find_varentry(VAR *);
const char *fmt_argv(char **, char *, size_t);
Modified: user/jmallett/octeon/bin/ps/keyword.c
==============================================================================
--- user/jmallett/octeon/bin/ps/keyword.c Tue Mar 23 06:19:44 2010 (r205509)
+++ user/jmallett/octeon/bin/ps/keyword.c Tue Mar 23 06:42:52 2010 (r205510)
@@ -89,6 +89,7 @@ static VAR var[] = {
{"emul", "EMUL", NULL, LJUST, emulname, NULL, EMULLEN, 0, CHAR,
NULL, 0},
{"etime", "ELAPSED", NULL, USER, elapsed, NULL, 12, 0, CHAR, NULL, 0},
+ {"etimes", "ELAPSED", NULL, USER, elapseds, NULL, 12, 0, CHAR, NULL, 0},
{"f", "F", NULL, 0, kvar, NULL, 7, KOFF(ki_flag), INT, "x", 0},
{"flags", "", "f", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
{"ignored", "", "sigignore", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
Modified: user/jmallett/octeon/bin/ps/print.c
==============================================================================
--- user/jmallett/octeon/bin/ps/print.c Tue Mar 23 06:19:44 2010 (r205509)
+++ user/jmallett/octeon/bin/ps/print.c Tue Mar 23 06:42:52 2010 (r205510)
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
#include <nlist.h>
#include <pwd.h>
#include <stddef.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -618,6 +619,21 @@ elapsed(KINFO *k, VARENT *ve)
(void)printf("%*s", v->width, obuff);
}
+void
+elapseds(KINFO *k, VARENT *ve)
+{
+ VAR *v;
+ time_t val;
+
+ v = ve->var;
+ if (!k->ki_valid) {
+ (void)printf("%-*s", v->width, "-");
+ return;
+ }
+ val = now - k->ki_p->ki_start.tv_sec;
+ (void)printf("%*jd", v->width, (intmax_t)val);
+}
+
double
getpcpu(const KINFO *k)
{
Modified: user/jmallett/octeon/bin/ps/ps.1
==============================================================================
--- user/jmallett/octeon/bin/ps/ps.1 Tue Mar 23 06:19:44 2010 (r205509)
+++ user/jmallett/octeon/bin/ps/ps.1 Tue Mar 23 06:42:52 2010 (r205510)
@@ -29,7 +29,7 @@
.\" @(#)ps.1 8.3 (Berkeley) 4/18/94
.\" $FreeBSD$
.\"
-.Dd March 5, 2010
+.Dd March 17, 2010
.Dt PS 1
.Os
.Sh NAME
@@ -479,7 +479,12 @@ command and arguments
.It Cm cpu
short-term CPU usage factor (for scheduling)
.It Cm etime
-elapsed running time
+elapsed running time, format
+.Op days- Ns
+.Op hours: Ns
+minutes:seconds.
+.It Cm etimes
+elapsed running time, in decimal integer seconds
.It Cm flags
the process flags, in hexadecimal (alias
.Cm f )
Modified: user/jmallett/octeon/bin/sh/eval.c
==============================================================================
--- user/jmallett/octeon/bin/sh/eval.c Tue Mar 23 06:19:44 2010 (r205509)
+++ user/jmallett/octeon/bin/sh/eval.c Tue Mar 23 06:42:52 2010 (r205510)
@@ -91,6 +91,7 @@ STATIC void evalloop(union node *, int);
STATIC void evalfor(union node *, int);
STATIC void evalcase(union node *, int);
STATIC void evalsubshell(union node *, int);
+STATIC void evalredir(union node *, int);
STATIC void expredir(union node *);
STATIC void evalpipe(union node *);
STATIC void evalcommand(union node *, int, struct backcmd *);
@@ -221,10 +222,7 @@ evaltree(union node *n, int flags)
evaltree(n->nbinary.ch2, flags);
break;
case NREDIR:
- expredir(n->nredir.redirect);
- redirect(n->nredir.redirect, REDIR_PUSH);
- evaltree(n->nredir.n, flags);
- popredir();
+ evalredir(n, flags);
break;
case NSUBSHELL:
evalsubshell(n, flags);
@@ -415,6 +413,46 @@ evalsubshell(union node *n, int flags)
}
+/*
+ * Evaluate a redirected compound command.
+ */
+
+STATIC void
+evalredir(union node *n, int flags)
+{
+ struct jmploc jmploc;
+ struct jmploc *savehandler;
+ volatile int in_redirect = 1;
+
+ expredir(n->nredir.redirect);
+ savehandler = handler;
+ if (setjmp(jmploc.loc)) {
+ int e;
+
+ handler = savehandler;
+ e = exception;
+ if (e == EXERROR || e == EXEXEC) {
+ popredir();
+ if (in_redirect) {
+ exitstatus = 2;
+ return;
+ }
+ }
+ longjmp(handler->loc, 1);
+ } else {
+ INTOFF;
+ handler = &jmploc;
+ redirect(n->nredir.redirect, REDIR_PUSH);
+ in_redirect = 0;
+ INTON;
+ evaltree(n->nredir.n, flags);
+ }
+ INTOFF;
+ handler = savehandler;
+ popredir();
+ INTON;
+}
+
/*
* Compute the names of the files in a redirection list.
@@ -680,7 +718,7 @@ evalcommand(union node *cmd, int flags,
/* Variable assignment(s) without command */
cmdentry.cmdtype = CMDBUILTIN;
cmdentry.u.index = BLTINCMD;
- cmdentry.special = 1;
+ cmdentry.special = 0;
} else {
static const char PATH[] = "PATH=";
int cmd_flags = 0, bltinonly = 0;
@@ -891,6 +929,12 @@ evalcommand(union node *cmd, int flags,
}
handler = &jmploc;
redirect(cmd->ncmd.redirect, mode);
+ /*
+ * If there is no command word, redirection errors should
+ * not be fatal but assignment errors should.
+ */
+ if (argc == 0 && !(flags & EV_BACKCMD))
+ cmdentry.special = 1;
if (cmdentry.special)
listsetvar(cmdenviron);
commandname = argv[0];
Modified: user/jmallett/octeon/bin/sh/parser.c
==============================================================================
--- user/jmallett/octeon/bin/sh/parser.c Tue Mar 23 06:19:44 2010 (r205509)
+++ user/jmallett/octeon/bin/sh/parser.c Tue Mar 23 06:42:52 2010 (r205510)
@@ -863,6 +863,164 @@ breakloop:
}
+/*
+ * Called to parse command substitutions.
+ */
+
+STATIC char *
+parsebackq(char *out, struct nodelist **pbqlist,
+ int oldstyle, int dblquote, int quoted)
+{
+ struct nodelist **nlpp;
+ union node *n;
+ char *volatile str;
+ struct jmploc jmploc;
+ struct jmploc *const savehandler = handler;
+ int savelen;
+ int saveprompt;
+ const int bq_startlinno = plinno;
+ char *volatile ostr = NULL;
+ struct parsefile *const savetopfile = getcurrentfile();
+
+ str = NULL;
+ if (setjmp(jmploc.loc)) {
+ popfilesupto(savetopfile);
+ if (str)
+ ckfree(str);
+ if (ostr)
+ ckfree(ostr);
+ handler = savehandler;
+ if (exception == EXERROR) {
+ startlinno = bq_startlinno;
+ synerror("Error in command substitution");
+ }
+ longjmp(handler->loc, 1);
+ }
+ INTOFF;
+ savelen = out - stackblock();
+ if (savelen > 0) {
+ str = ckmalloc(savelen);
+ memcpy(str, stackblock(), savelen);
+ }
+ handler = &jmploc;
+ INTON;
+ if (oldstyle) {
+ /* We must read until the closing backquote, giving special
+ treatment to some slashes, and then push the string and
+ reread it as input, interpreting it normally. */
+ char *oout;
+ int c;
+ int olen;
+
+
+ STARTSTACKSTR(oout);
+ for (;;) {
+ if (needprompt) {
+ setprompt(2);
+ needprompt = 0;
+ }
+ switch (c = pgetc()) {
+ case '`':
+ goto done;
+
+ case '\\':
+ if ((c = pgetc()) == '\n') {
+ plinno++;
+ if (doprompt)
+ setprompt(2);
+ else
+ setprompt(0);
+ /*
+ * If eating a newline, avoid putting
+ * the newline into the new character
+ * stream (via the STPUTC after the
+ * switch).
+ */
+ continue;
+ }
+ if (c != '\\' && c != '`' && c != '$'
+ && (!dblquote || c != '"'))
+ STPUTC('\\', oout);
+ break;
+
+ case '\n':
+ plinno++;
+ needprompt = doprompt;
+ break;
+
+ case PEOF:
+ startlinno = plinno;
+ synerror("EOF in backquote substitution");
+ break;
+
+ default:
+ break;
+ }
+ STPUTC(c, oout);
+ }
+done:
+ STPUTC('\0', oout);
+ olen = oout - stackblock();
+ INTOFF;
+ ostr = ckmalloc(olen);
+ memcpy(ostr, stackblock(), olen);
+ setinputstring(ostr, 1);
+ INTON;
+ }
+ nlpp = pbqlist;
+ while (*nlpp)
+ nlpp = &(*nlpp)->next;
+ *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist));
+ (*nlpp)->next = NULL;
+
+ if (oldstyle) {
+ saveprompt = doprompt;
+ doprompt = 0;
+ }
+
+ n = list(0);
+
+ if (oldstyle)
+ doprompt = saveprompt;
+ else {
+ if (readtoken() != TRP)
+ synexpect(TRP);
+ }
+
+ (*nlpp)->n = n;
+ if (oldstyle) {
+ /*
+ * Start reading from old file again, ignoring any pushed back
+ * tokens left from the backquote parsing
+ */
+ popfile();
+ tokpushback = 0;
+ }
+ while (stackblocksize() <= savelen)
+ growstackblock();
+ STARTSTACKSTR(out);
+ if (str) {
+ memcpy(out, str, savelen);
+ STADJUST(savelen, out);
+ INTOFF;
+ ckfree(str);
+ str = NULL;
+ INTON;
+ }
+ if (ostr) {
+ INTOFF;
+ ckfree(ostr);
+ ostr = NULL;
+ INTON;
+ }
+ handler = savehandler;
+ if (quoted)
+ USTPUTC(CTLBACKQ | CTLQUOTE, out);
+ else
+ USTPUTC(CTLBACKQ, out);
+ return out;
+}
+
/*
* If eofmark is NULL, read a word or a redirection symbol. If eofmark
@@ -879,8 +1037,6 @@ breakloop:
#define CHECKEND() {goto checkend; checkend_return:;}
#define PARSEREDIR() {goto parseredir; parseredir_return:;}
#define PARSESUB() {goto parsesub; parsesub_return:;}
-#define PARSEBACKQOLD() {oldstyle = 1; goto parsebackq; parsebackq_oldreturn:;}
-#define PARSEBACKQNEW() {oldstyle = 0; goto parsebackq; parsebackq_newreturn:;}
#define PARSEARITH() {goto parsearith; parsearith_return:;}
STATIC int
@@ -896,7 +1052,6 @@ readtoken1(int firstc, char const *synta
int varnest; /* levels of variables expansion */
int arinest; /* levels of arithmetic expansion */
int parenlevel; /* levels of parens in arithmetic */
- int oldstyle;
char const *prevsyntax; /* syntax before arithmetic */
int synentry;
@@ -1029,7 +1184,8 @@ readtoken1(int firstc, char const *synta
}
break;
case CBQUOTE: /* '`' */
- PARSEBACKQOLD();
+ out = parsebackq(out, &bqlist, 1, dblquote,
+ arinest || dblquote);
break;
case CEOF:
goto endword; /* exit outer loop */
@@ -1189,7 +1345,8 @@ parsesub: {
PARSEARITH();
} else {
pungetc();
- PARSEBACKQNEW();
+ out = parsebackq(out, &bqlist, 0, dblquote,
+ arinest || dblquote);
}
} else {
USTPUTC(CTLVAR, out);
@@ -1296,167 +1453,6 @@ parsesub: {
/*
- * Called to parse command substitutions. Newstyle is set if the command
- * is enclosed inside $(...); nlpp is a pointer to the head of the linked
- * list of commands (passed by reference), and savelen is the number of
- * characters on the top of the stack which must be preserved.
- */
-
-parsebackq: {
- struct nodelist **nlpp;
- union node *n;
- char *volatile str;
- struct jmploc jmploc;
- struct jmploc *const savehandler = handler;
- int savelen;
- int saveprompt;
- const int bq_startlinno = plinno;
- char *volatile ostr = NULL;
- struct parsefile *const savetopfile = getcurrentfile();
-
- str = NULL;
- if (setjmp(jmploc.loc)) {
- popfilesupto(savetopfile);
- if (str)
- ckfree(str);
- if (ostr)
- ckfree(ostr);
- handler = savehandler;
- if (exception == EXERROR) {
- startlinno = bq_startlinno;
- synerror("Error in command substitution");
- }
- longjmp(handler->loc, 1);
- }
- INTOFF;
- savelen = out - stackblock();
- if (savelen > 0) {
- str = ckmalloc(savelen);
- memcpy(str, stackblock(), savelen);
- }
- handler = &jmploc;
- INTON;
- if (oldstyle) {
- /* We must read until the closing backquote, giving special
- treatment to some slashes, and then push the string and
- reread it as input, interpreting it normally. */
- char *oout;
- int c;
- int olen;
-
-
- STARTSTACKSTR(oout);
- for (;;) {
- if (needprompt) {
- setprompt(2);
- needprompt = 0;
- }
- switch (c = pgetc()) {
- case '`':
- goto done;
-
- case '\\':
- if ((c = pgetc()) == '\n') {
- plinno++;
- if (doprompt)
- setprompt(2);
- else
- setprompt(0);
- /*
- * If eating a newline, avoid putting
- * the newline into the new character
- * stream (via the STPUTC after the
- * switch).
- */
- continue;
- }
- if (c != '\\' && c != '`' && c != '$'
- && (!dblquote || c != '"'))
- STPUTC('\\', oout);
- break;
-
- case '\n':
- plinno++;
- needprompt = doprompt;
- break;
-
- case PEOF:
- startlinno = plinno;
- synerror("EOF in backquote substitution");
- break;
-
- default:
- break;
- }
- STPUTC(c, oout);
- }
-done:
- STPUTC('\0', oout);
- olen = oout - stackblock();
- INTOFF;
- ostr = ckmalloc(olen);
- memcpy(ostr, stackblock(), olen);
- setinputstring(ostr, 1);
- INTON;
- }
- nlpp = &bqlist;
- while (*nlpp)
- nlpp = &(*nlpp)->next;
- *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist));
- (*nlpp)->next = NULL;
-
- if (oldstyle) {
- saveprompt = doprompt;
- doprompt = 0;
- }
-
- n = list(0);
-
- if (oldstyle)
- doprompt = saveprompt;
- else {
- if (readtoken() != TRP)
- synexpect(TRP);
- }
-
- (*nlpp)->n = n;
- if (oldstyle) {
- /*
- * Start reading from old file again, ignoring any pushed back
- * tokens left from the backquote parsing
- */
- popfile();
- tokpushback = 0;
- }
- while (stackblocksize() <= savelen)
- growstackblock();
- STARTSTACKSTR(out);
- if (str) {
- memcpy(out, str, savelen);
- STADJUST(savelen, out);
- INTOFF;
- ckfree(str);
- str = NULL;
- INTON;
- }
- if (ostr) {
- INTOFF;
- ckfree(ostr);
- ostr = NULL;
- INTON;
- }
- handler = savehandler;
- if (arinest || dblquote)
- USTPUTC(CTLBACKQ | CTLQUOTE, out);
- else
- USTPUTC(CTLBACKQ, out);
- if (oldstyle)
- goto parsebackq_oldreturn;
- else
- goto parsebackq_newreturn;
-}
-
-/*
* Parse an arithmetic expansion (indicate start of one and set state)
*/
parsearith: {
Modified: user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
==============================================================================
--- user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Tue Mar 23 06:19:44 2010 (r205509)
+++ user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Tue Mar 23 06:42:52 2010 (r205510)
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -53,11 +53,14 @@ typedef struct zfs_node {
} zfs_node_t;
typedef struct callback_data {
- uu_avl_t *cb_avl;
- int cb_flags;
- zfs_type_t cb_types;
- zfs_sort_column_t *cb_sortcol;
- zprop_list_t **cb_proplist;
+ uu_avl_t *cb_avl;
+ int cb_flags;
+ zfs_type_t cb_types;
+ zfs_sort_column_t *cb_sortcol;
+ zprop_list_t **cb_proplist;
+ int cb_depth_limit;
+ int cb_depth;
+ uint8_t cb_props_table[ZFS_NUM_PROPS];
} callback_data_t;
uu_avl_pool_t *avl_pool;
@@ -98,10 +101,17 @@ zfs_callback(zfs_handle_t *zhp, void *da
uu_avl_node_init(node, &node->zn_avlnode, avl_pool);
if (uu_avl_find(cb->cb_avl, node, cb->cb_sortcol,
&idx) == NULL) {
- if (cb->cb_proplist &&
- zfs_expand_proplist(zhp, cb->cb_proplist) != 0) {
- free(node);
- return (-1);
+ if (cb->cb_proplist) {
+ if ((*cb->cb_proplist) &&
+ !(*cb->cb_proplist)->pl_all)
+ zfs_prune_proplist(zhp,
+ cb->cb_props_table);
+
+ if (zfs_expand_proplist(zhp, cb->cb_proplist)
+ != 0) {
+ free(node);
+ return (-1);
+ }
}
uu_avl_insert(cb->cb_avl, node, idx);
dontclose = 1;
@@ -113,11 +123,15 @@ zfs_callback(zfs_handle_t *zhp, void *da
/*
* Recurse if necessary.
*/
- if (cb->cb_flags & ZFS_ITER_RECURSE) {
+ if (cb->cb_flags & ZFS_ITER_RECURSE &&
+ ((cb->cb_flags & ZFS_ITER_DEPTH_LIMIT) == 0 ||
+ cb->cb_depth < cb->cb_depth_limit)) {
+ cb->cb_depth++;
if (zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM)
(void) zfs_iter_filesystems(zhp, zfs_callback, data);
if ((zfs_get_type(zhp) != ZFS_TYPE_SNAPSHOT) && include_snaps)
(void) zfs_iter_snapshots(zhp, zfs_callback, data);
+ cb->cb_depth--;
}
if (!dontclose)
@@ -325,10 +339,10 @@ zfs_sort(const void *larg, const void *r
int
zfs_for_each(int argc, char **argv, int flags, zfs_type_t types,
- zfs_sort_column_t *sortcol, zprop_list_t **proplist,
+ zfs_sort_column_t *sortcol, zprop_list_t **proplist, int limit,
zfs_iter_f callback, void *data)
{
- callback_data_t cb;
+ callback_data_t cb = {0};
int ret = 0;
zfs_node_t *node;
uu_avl_walk_t *walk;
@@ -346,6 +360,45 @@ zfs_for_each(int argc, char **argv, int
cb.cb_flags = flags;
cb.cb_proplist = proplist;
cb.cb_types = types;
+ cb.cb_depth_limit = limit;
+ /*
+ * If cb_proplist is provided then in the zfs_handles created we
+ * retain only those properties listed in cb_proplist and sortcol.
+ * The rest are pruned. So, the caller should make sure that no other
+ * properties other than those listed in cb_proplist/sortcol are
+ * accessed.
+ *
+ * If cb_proplist is NULL then we retain all the properties. We
+ * always retain the zoned property, which some other properties
+ * need (userquota & friends), and the createtxg property, which
+ * we need to sort snapshots.
+ */
+ if (cb.cb_proplist && *cb.cb_proplist) {
+ zprop_list_t *p = *cb.cb_proplist;
+
+ while (p) {
+ if (p->pl_prop >= ZFS_PROP_TYPE &&
+ p->pl_prop < ZFS_NUM_PROPS) {
+ cb.cb_props_table[p->pl_prop] = B_TRUE;
+ }
+ p = p->pl_next;
+ }
+
+ while (sortcol) {
+ if (sortcol->sc_prop >= ZFS_PROP_TYPE &&
+ sortcol->sc_prop < ZFS_NUM_PROPS) {
+ cb.cb_props_table[sortcol->sc_prop] = B_TRUE;
+ }
+ sortcol = sortcol->sc_next;
+ }
+
+ cb.cb_props_table[ZFS_PROP_ZONED] = B_TRUE;
+ cb.cb_props_table[ZFS_PROP_CREATETXG] = B_TRUE;
+ } else {
+ (void) memset(cb.cb_props_table, B_TRUE,
+ sizeof (cb.cb_props_table));
+ }
+
if ((cb.cb_avl = uu_avl_create(avl_pool, NULL, UU_DEFAULT)) == NULL) {
(void) fprintf(stderr,
gettext("internal error: out of memory\n"));
Modified: user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h
==============================================================================
--- user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h Tue Mar 23 06:19:44 2010 (r205509)
+++ user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h Tue Mar 23 06:42:52 2010 (r205510)
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -41,9 +41,10 @@ typedef struct zfs_sort_column {
#define ZFS_ITER_RECURSE (1 << 0)
#define ZFS_ITER_ARGS_CAN_BE_PATHS (1 << 1)
#define ZFS_ITER_PROP_LISTSNAPS (1 << 2)
+#define ZFS_ITER_DEPTH_LIMIT (1 << 3)
int zfs_for_each(int, char **, int options, zfs_type_t,
- zfs_sort_column_t *, zprop_list_t **, zfs_iter_f, void *);
+ zfs_sort_column_t *, zprop_list_t **, int, zfs_iter_f, void *);
int zfs_add_sort_column(zfs_sort_column_t **, const char *, boolean_t);
void zfs_free_sort_columns(zfs_sort_column_t *);
Modified: user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Mar 23 06:19:44 2010 (r205509)
+++ user/jmallett/octeon/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Tue Mar 23 06:42:52 2010 (r205510)
@@ -190,8 +190,8 @@ get_usage(zfs_help_t idx)
return (gettext("\tdestroy [-rRf] "
"<filesystem|volume|snapshot>\n"));
case HELP_GET:
- return (gettext("\tget [-rHp] [-o field[,...]] "
- "[-s source[,...]]\n"
+ return (gettext("\tget [-rHp] [-d max] "
+ "[-o field[,...]] [-s source[,...]]\n"
"\t <\"all\" | property[,...]> "
"[filesystem|volume|snapshot] ...\n"));
case HELP_INHERIT:
@@ -205,8 +205,8 @@ get_usage(zfs_help_t idx)
case HELP_UNJAIL:
return (gettext("\tunjail <jailid> <filesystem>\n"));
case HELP_LIST:
- return (gettext("\tlist [-rH] [-o property[,...]] "
- "[-t type[,...]] [-s property] ...\n"
+ return (gettext("\tlist [-rH][-d max] "
+ "[-o property[,...]] [-t type[,...]] [-s property] ...\n"
"\t [-S property] ... "
"[filesystem|volume|snapshot] ...\n"));
case HELP_MOUNT:
@@ -432,6 +432,27 @@ parseprop(nvlist_t *props)
}
+static int
+parse_depth(char *opt, int *flags)
+{
+ char *tmp;
+ int depth;
+
+ depth = (int)strtol(opt, &tmp, 0);
+ if (*tmp) {
+ (void) fprintf(stderr,
+ gettext("%s is not an integer\n"), optarg);
+ usage(B_FALSE);
+ }
+ if (depth < 0) {
+ (void) fprintf(stderr,
+ gettext("Depth can not be negative.\n"));
+ usage(B_FALSE);
+ }
+ *flags |= (ZFS_ITER_DEPTH_LIMIT|ZFS_ITER_RECURSE);
+ return (depth);
+}
+
/*
* zfs clone [-p] [-o prop=value] ... <snap> <fs | vol>
*
@@ -1119,6 +1140,7 @@ zfs_do_get(int argc, char **argv)
int i, c, flags = 0;
char *value, *fields;
int ret;
+ int limit = 0;
zprop_list_t fake_name = { 0 };
/*
@@ -1132,11 +1154,14 @@ zfs_do_get(int argc, char **argv)
cb.cb_type = ZFS_TYPE_DATASET;
/* check options */
- while ((c = getopt(argc, argv, ":o:s:rHp")) != -1) {
+ while ((c = getopt(argc, argv, ":d:o:s:rHp")) != -1) {
switch (c) {
case 'p':
cb.cb_literal = B_TRUE;
break;
+ case 'd':
+ limit = parse_depth(optarg, &flags);
+ break;
case 'r':
flags |= ZFS_ITER_RECURSE;
break;
@@ -1267,7 +1292,7 @@ zfs_do_get(int argc, char **argv)
/* run for each object */
ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_DATASET, NULL,
- &cb.cb_proplist, get_callback, &cb);
+ &cb.cb_proplist, limit, get_callback, &cb);
if (cb.cb_proplist == &fake_name)
zprop_free_list(fake_name.pl_next);
@@ -1380,10 +1405,10 @@ zfs_do_inherit(int argc, char **argv)
if (flags & ZFS_ITER_RECURSE) {
ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_DATASET,
- NULL, NULL, inherit_recurse_cb, propname);
+ NULL, NULL, 0, inherit_recurse_cb, propname);
} else {
ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_DATASET,
- NULL, NULL, inherit_cb, propname);
+ NULL, NULL, 0, inherit_cb, propname);
}
return (ret);
@@ -1578,7 +1603,7 @@ zfs_do_upgrade(int argc, char **argv)
if (cb.cb_version == 0)
cb.cb_version = ZPL_VERSION;
ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_FILESYSTEM,
- NULL, NULL, upgrade_set_callback, &cb);
+ NULL, NULL, 0, upgrade_set_callback, &cb);
(void) printf(gettext("%llu filesystems upgraded\n"),
cb.cb_numupgraded);
if (cb.cb_numsamegraded) {
@@ -1596,14 +1621,14 @@ zfs_do_upgrade(int argc, char **argv)
flags |= ZFS_ITER_RECURSE;
ret = zfs_for_each(0, NULL, flags, ZFS_TYPE_FILESYSTEM,
- NULL, NULL, upgrade_list_callback, &cb);
+ NULL, NULL, 0, upgrade_list_callback, &cb);
found = cb.cb_foundone;
cb.cb_foundone = B_FALSE;
cb.cb_newer = B_TRUE;
ret = zfs_for_each(0, NULL, flags, ZFS_TYPE_FILESYSTEM,
- NULL, NULL, upgrade_list_callback, &cb);
+ NULL, NULL, 0, upgrade_list_callback, &cb);
if (!cb.cb_foundone && !found) {
(void) printf(gettext("All filesystems are "
@@ -1615,11 +1640,12 @@ zfs_do_upgrade(int argc, char **argv)
}
/*
- * list [-rH] [-o property[,property]...] [-t type[,type]...]
+ * list [-r][-d max] [-H] [-o property[,property]...] [-t type[,type]...]
* [-s property [-s property]...] [-S property [-S property]...]
* <dataset> ...
*
* -r Recurse over all children
+ * -d Limit recursion by depth.
* -H Scripted mode; elide headers and separate columns by tabs
* -o Control which fields to display.
* -t Control which object types to display.
@@ -1769,16 +1795,20 @@ zfs_do_list(int argc, char **argv)
char *fields = NULL;
list_cbdata_t cb = { 0 };
char *value;
+ int limit = 0;
int ret;
zfs_sort_column_t *sortcol = NULL;
int flags = ZFS_ITER_PROP_LISTSNAPS | ZFS_ITER_ARGS_CAN_BE_PATHS;
/* check options */
- while ((c = getopt(argc, argv, ":o:rt:Hs:S:")) != -1) {
+ while ((c = getopt(argc, argv, ":d:o:rt:Hs:S:")) != -1) {
switch (c) {
case 'o':
fields = optarg;
break;
+ case 'd':
+ limit = parse_depth(optarg, &flags);
+ break;
case 'r':
flags |= ZFS_ITER_RECURSE;
break;
@@ -1869,7 +1899,7 @@ zfs_do_list(int argc, char **argv)
cb.cb_first = B_TRUE;
ret = zfs_for_each(argc, argv, flags, types, sortcol, &cb.cb_proplist,
- list_callback, &cb);
+ limit, list_callback, &cb);
zprop_free_list(cb.cb_proplist);
zfs_free_sort_columns(sortcol);
@@ -2252,7 +2282,7 @@ zfs_do_set(int argc, char **argv)
}
ret = zfs_for_each(argc - 2, argv + 2, NULL,
- ZFS_TYPE_DATASET, NULL, NULL, set_callback, &cb);
+ ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, &cb);
return (ret);
}
@@ -2886,7 +2916,7 @@ zfs_do_unallow(int argc, char **argv)
flags |= ZFS_ITER_RECURSE;
error = zfs_for_each(argc, argv, flags,
ZFS_TYPE_FILESYSTEM|ZFS_TYPE_VOLUME, NULL,
- NULL, unallow_callback, (void *)zperms);
+ NULL, 0, unallow_callback, (void *)zperms);
if (zperms)
nvlist_free(zperms);
Modified: user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Tue Mar 23 06:19:44 2010 (r205509)
+++ user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Tue Mar 23 06:42:52 2010 (r205510)
@@ -369,6 +369,7 @@ typedef struct zprop_list {
} zprop_list_t;
extern int zfs_expand_proplist(zfs_handle_t *, zprop_list_t **);
+extern void zfs_prune_proplist(zfs_handle_t *, uint8_t *);
#define ZFS_MOUNTPOINT_NONE "none"
#define ZFS_MOUNTPOINT_LEGACY "legacy"
Modified: user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Tue Mar 23 06:19:44 2010 (r205509)
+++ user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Tue Mar 23 06:42:52 2010 (r205510)
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -2045,6 +2045,8 @@ getprop_uint64(zfs_handle_t *zhp, zfs_pr
verify(nvlist_lookup_uint64(nv, ZPROP_VALUE, &value) == 0);
(void) nvlist_lookup_string(nv, ZPROP_SOURCE, source);
} else {
+ verify(!zhp->zfs_props_table ||
+ zhp->zfs_props_table[prop] == B_TRUE);
value = zfs_prop_default_numeric(prop);
*source = "";
}
@@ -2064,6 +2066,8 @@ getprop_string(zfs_handle_t *zhp, zfs_pr
verify(nvlist_lookup_string(nv, ZPROP_VALUE, &value) == 0);
(void) nvlist_lookup_string(nv, ZPROP_SOURCE, source);
} else {
+ verify(!zhp->zfs_props_table ||
+ zhp->zfs_props_table[prop] == B_TRUE);
if ((value = (char *)zfs_prop_default_string(prop)) == NULL)
value = "";
*source = "";
@@ -4267,6 +4271,30 @@ zfs_deleg_share_nfs(libzfs_handle_t *hdl
return (error);
}
+void
+zfs_prune_proplist(zfs_handle_t *zhp, uint8_t *props)
+{
+ nvpair_t *curr;
+
+ /*
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list